diff --git a/.env.development b/.env.development
index 2744ed2..38cb478 100644
--- a/.env.development
+++ b/.env.development
@@ -1,8 +1,8 @@
 # 页面标题
-VITE_APP_TITLE = 若依管理系统
+VITE_APP_TITLE = 天然气工具平台
 
 # 开发环境配置
 VITE_APP_ENV = 'development'
 
-# 若依管理系统/开发环境
+# 天然气工具平台/开发环境
 VITE_APP_BASE_API = '/dev-api'
diff --git a/.env.production b/.env.production
index d857bba..5f720a4 100644
--- a/.env.production
+++ b/.env.production
@@ -1,10 +1,10 @@
 # 页面标题
-VITE_APP_TITLE = 若依管理系统
+VITE_APP_TITLE = 天然气工具平台
 
 # 生产环境配置
 VITE_APP_ENV = 'production'
 
-# 若依管理系统/生产环境
+# 天然气工具平台/生产环境
 VITE_APP_BASE_API = '/prod-api'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
diff --git a/.env.staging b/.env.staging
index fa7c357..0290f88 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,10 +1,10 @@
 # 页面标题
-VITE_APP_TITLE = 若依管理系统
+VITE_APP_TITLE = 天然气工具平台
 
 # 生产环境配置
 VITE_APP_ENV = 'staging'
 
-# 若依管理系统/生产环境
+# 天然气工具平台/生产环境
 VITE_APP_BASE_API = '/stage-api'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
diff --git a/index.html b/index.html
index 179579b..6c6f048 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="/favicon.ico">
-  <title>若依管理系统</title>
+  <title>天然气工具平台</title>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
     html,
diff --git a/package.json b/package.json
index a4a1a8a..b83333a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.8.9",
-  "description": "若依管理系统",
+  "description": "天然气工具平台",
   "author": "若依",
   "license": "MIT",
   "type": "module",
diff --git a/src/api/ngtools/NGCalcTools.js b/src/api/ngtools/NGCalcTools.js
new file mode 100644
index 0000000..5871368
--- /dev/null
+++ b/src/api/ngtools/NGCalcTools.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+// 天然气物性参数计算
+export function calcNGPar(data) {
+  return request({
+    url: '/NGCalcTools/ngCalc',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+// 天然气物性参数计算
+export function calcFlow(data) {
+  return request({
+    url: '/flowCalcTools/flowCalc',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
diff --git a/src/api/ngtools/components.js b/src/api/ngtools/components.js
new file mode 100644
index 0000000..1346dd2
--- /dev/null
+++ b/src/api/ngtools/components.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询天然气组分列表
+export function listComponents(query) {
+  return request({
+    url: '/ngtools/components/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询天然气组分详细
+export function getComponents(id) {
+  return request({
+    url: '/ngtools/components/' + id,
+    method: 'get'
+  })
+}
+
+// 新增天然气组分
+export function addComponents(data) {
+  return request({
+    url: '/ngtools/components',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改天然气组分
+export function updateComponents(data) {
+  return request({
+    url: '/ngtools/components',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除天然气组分
+export function delComponents(id) {
+  return request({
+    url: '/ngtools/components/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/ngtools/meterpar.js b/src/api/ngtools/meterpar.js
new file mode 100644
index 0000000..72f2b0c
--- /dev/null
+++ b/src/api/ngtools/meterpar.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询流量计参数列表
+export function listMeterpar(query) {
+  return request({
+    url: '/ngtools/meterpar/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询流量计参数详细
+export function getMeterpar(id) {
+  return request({
+    url: '/ngtools/meterpar/' + id,
+    method: 'get'
+  })
+}
+
+// 新增流量计参数
+export function addMeterpar(data) {
+  return request({
+    url: '/ngtools/meterpar',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改流量计参数
+export function updateMeterpar(data) {
+  return request({
+    url: '/ngtools/meterpar',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除流量计参数
+export function delMeterpar(id) {
+  return request({
+    url: '/ngtools/meterpar/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/ngtools/meterresult.js b/src/api/ngtools/meterresult.js
new file mode 100644
index 0000000..cf583ba
--- /dev/null
+++ b/src/api/ngtools/meterresult.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询流量计算结果列表
+export function listMeterresult(query) {
+  return request({
+    url: '/ngtools/meterresult/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询流量计算结果详细
+export function getMeterresult(id) {
+  return request({
+    url: '/ngtools/meterresult/' + id,
+    method: 'get'
+  })
+}
+
+// 新增流量计算结果
+export function addMeterresult(data) {
+  return request({
+    url: '/ngtools/meterresult',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改流量计算结果
+export function updateMeterresult(data) {
+  return request({
+    url: '/ngtools/meterresult',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除流量计算结果
+export function delMeterresult(id) {
+  return request({
+    url: '/ngtools/meterresult/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/ngtools/ngpar.js b/src/api/ngtools/ngpar.js
new file mode 100644
index 0000000..b02d006
--- /dev/null
+++ b/src/api/ngtools/ngpar.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询天然气物性参数列表
+export function listNgpar(query) {
+  return request({
+    url: '/ngtools/ngpar/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询天然气物性参数详细
+export function getNgpar(id) {
+  return request({
+    url: '/ngtools/ngpar/' + id,
+    method: 'get'
+  })
+}
+
+// 新增天然气物性参数
+export function addNgpar(data) {
+  return request({
+    url: '/ngtools/ngpar',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改天然气物性参数
+export function updateNgpar(data) {
+  return request({
+    url: '/ngtools/ngpar',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除天然气物性参数
+export function delNgpar(id) {
+  return request({
+    url: '/ngtools/ngpar/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/system/sysUnitConvert.js b/src/api/system/sysUnitConvert.js
new file mode 100644
index 0000000..10f92d4
--- /dev/null
+++ b/src/api/system/sysUnitConvert.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询单位换算列表
+export function listSysUnitConvert(query) {
+  return request({
+    url: '/system/sysUnitConvert/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询单位换算详细
+export function getSysUnitConvert(id) {
+  return request({
+    url: '/system/sysUnitConvert/' + id,
+    method: 'get'
+  })
+}
+
+// 新增单位换算
+export function addSysUnitConvert(data) {
+  return request({
+    url: '/system/sysUnitConvert',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改单位换算
+export function updateSysUnitConvert(data) {
+  return request({
+    url: '/system/sysUnitConvert',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除单位换算
+export function delSysUnitConvert(id) {
+  return request({
+    url: '/system/sysUnitConvert/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/system/treeDict.js b/src/api/system/treeDict.js
new file mode 100644
index 0000000..8317e69
--- /dev/null
+++ b/src/api/system/treeDict.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询树形字典列表
+export function listTreeDict(query) {
+  return request({
+    url: '/system/treeDict/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询树形字典详细
+export function getTreeDict(id) {
+  return request({
+    url: '/system/treeDict/' + id,
+    method: 'get'
+  })
+}
+
+// 新增树形字典
+export function addTreeDict(data) {
+  return request({
+    url: '/system/treeDict',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改树形字典
+export function updateTreeDict(data) {
+  return request({
+    url: '/system/treeDict',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除树形字典
+export function delTreeDict(id) {
+  return request({
+    url: '/system/treeDict/' + id,
+    method: 'delete'
+  })
+}
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/NGTools/NGCom.vue b/src/components/NGTools/NGCom.vue
new file mode 100644
index 0000000..6a715b0
--- /dev/null
+++ b/src/components/NGTools/NGCom.vue
@@ -0,0 +1,263 @@
+<template>
+	<div class="app-container">
+		<el-form label-position="top" size="small" :inline="true" class="component-form">
+			<!-- <el-row> -->
+			<!-- 常用组分选择框 -->
+			<!-- <el-col :span="10"> -->
+			<el-form-item label="常用组分" :style="{ width: selectWidth + 'px' }">
+				<el-select v-model="selectedComponent" @change="handleComponentChange" placeholder="请选择常用组分" clearable filterable>
+					<el-option v-for="dict in ngtools_cyzf" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<!-- </el-col> -->
+			<!-- 合计输入框 -->
+			<!-- <el-col :span="6"> -->
+			<el-form-item label="合计" :style="{ width: selectWidth + 'px' }">
+				<el-input :value="totalPercentage" readonly class="total-input" />
+			</el-form-item>
+			<!-- </el-col> -->
+			<!-- </el-row> -->
+		</el-form>
+
+		<el-form :model="formData" label-position="top" size="small" :inline="true" class="component-form">
+			<el-form-item v-for="field in componentFields" :key="field.prop" :label="field.label" :prop="field.prop" :style="{ width: selectWidth + 'px' }">
+				<el-input v-model="formData[field.prop]" controls-position="right" @change="handleValueChange" @focus="selectAllText" />
+			</el-form-item>
+		</el-form>
+	</div>
+</template>
+
+<script setup>
+import { ref, watch, onMounted, computed } from 'vue';
+import { listComponents, getComponents, delComponents, addComponents, updateComponents } from '@/api/ngtools/components';
+const { proxy } = getCurrentInstance();
+const { ngtools_cyzf } = proxy.useDict('ngtools_cyzf');
+// 字段配置元数据
+const COMPONENT_FIELDS = [
+	{
+		prop: 'ngC1',
+		label: '甲烷C1'
+	},
+	{
+		prop: 'ngN2',
+		label: '氮气N2'
+	},
+	{
+		prop: 'ngCo2',
+		label: '二氧化碳CO2'
+	},
+	{
+		prop: 'ngC2',
+		label: '乙烷C2'
+	},
+	{
+		prop: 'ngC3',
+		label: '丙烷C3'
+	},
+	{
+		prop: 'ngH2o',
+		label: '水H2O'
+	},
+	{
+		prop: 'ngH2s',
+		label: '硫化氢H2S'
+	},
+	{
+		prop: 'ngH2',
+		label: '氢气H2'
+	},
+	{
+		prop: 'ngCo',
+		label: '一氧化碳CO'
+	},
+	{
+		prop: 'ngO2',
+		label: '氧气O2'
+	},
+	{
+		prop: 'ngIc4',
+		label: '异丁烷iC4'
+	},
+	{
+		prop: 'ngNc4',
+		label: '正丁烷nC4'
+	},
+	{
+		prop: 'ngIc5',
+		label: '异戊烷iC5'
+	},
+	{
+		prop: 'ngNc5',
+		label: '正戊烷nC5'
+	},
+	{
+		prop: 'ngC6',
+		label: '己烷C6'
+	},
+	{
+		prop: 'ngC7',
+		label: '庚烷C7'
+	},
+	{
+		prop: 'ngC8',
+		label: '辛烷C8'
+	},
+	{
+		prop: 'ngC9',
+		label: '壬烷C9'
+	},
+	{
+		prop: 'ngC10',
+		label: '癸烷C10'
+	},
+	{
+		prop: 'ngHe',
+		label: '氦气He'
+	},
+	{
+		prop: 'ngAr',
+		label: '氩气Ar'
+	}
+];
+
+// 定义 props
+const props = defineProps({
+	modelValue: {
+		type: String,
+		default: ''
+	},
+	elFormWidth: {
+		type: Number,
+		default: 180
+	}
+});
+
+// 定义 emits
+const emits = defineEmits(['update:modelValue']);
+
+// 定义响应式数据
+const selectWidth = ref(0);
+const selectedComponent = ref(null);
+const formData = ref(initFormData());
+const componentFields = ref(COMPONENT_FIELDS);
+
+// 计算属性
+const totalPercentage = computed(() => {
+	return Object.values(formData.value)
+		.reduce((sum, val) => sum + (parseFloat(val) || 0), 0)
+		.toFixed(4);
+});
+
+// 初始化表单数据
+function initFormData() {
+	return COMPONENT_FIELDS.reduce((acc, field) => {
+		acc[field.prop] = 0;
+		return acc;
+	}, {});
+}
+
+// 全选输入框文本
+function selectAllText(event) {
+	const inputElement = event.target;
+	inputElement.select();
+}
+
+// 解析传入的字符串值
+function parseValueString(valueStr) {
+	const values = (valueStr || '').split('_');
+	componentFields.value.forEach((field, index) => {
+		const value = parseFloat(values[index]) || 0;
+		formData.value[field.prop] = value;
+	});
+}
+
+// 生成要输出的字符串值
+function generateValueString() {
+	return Object.values(formData.value)
+		.map((v) => v.toFixed(4))
+		.join('_');
+}
+
+// 处理组件选择变化
+async function handleComponentChange(value) {
+	if (!value) return;
+	console.log(value);
+	try {
+		const temp = value.replace(/\\'"/g, '"').replace(/'/g, '"');
+		const componentData = Object.assign({}, formData.value, JSON.parse(temp));
+		Object.keys(formData.value).forEach((key) => {
+			formData.value[key] = parseFloat(componentData[key]) || 0;
+		});
+		emitUpdate();
+	} catch (error) {
+		// 这里假设使用了 ElementPlus 的消息提示，需要根据实际情况修改
+		ElMessage.error('获取标准组分失败');
+		console.error(error);
+	}
+}
+
+// 处理值变化
+function handleValueChange() {
+	nextTick(() => {
+		emitUpdate();
+	});
+}
+
+// 触发更新事件
+function emitUpdate() {
+	if (Math.abs(parseFloat(totalPercentage.value) - 100) > 0.0001) {
+		// 这里假设使用了 ElementPlus 的消息提示，需要根据实际情况修改
+		ElMessage.warning('组分合计不等于100%，请检查输入');
+	}
+	console.log(generateValueString());
+	emits('update:modelValue', generateValueString());
+}
+
+// 获取组分数据
+async function fetchComponentData(params) {
+	try {
+		const { data } = await getComponents(params);
+		parseValueString(data.componentStr);
+	} catch (error) {
+		console.error('获取组分数据失败:', error);
+	}
+}
+
+// 监听 elFormWidth 的变化
+watch(
+	() => props.elFormWidth,
+	(newVal) => {
+		selectWidth.value = newVal;
+	},
+	{ deep: true }
+);
+
+// 监听 value 的变化
+watch(
+	() => props.modelValue,
+	(newVal) => {
+		parseValueString(newVal);
+	},
+	{ immediate: true }
+);
+
+// 挂载后设置 selectWidth
+onMounted(() => {
+	selectWidth.value = props.elFormWidth;
+});
+</script>
+
+<style scoped>
+.component-form {
+	display: grid;
+	/* 优化后的自适应规则 */
+	grid-template-columns: repeat(auto-fit, minmax(min(200px, 100%), 1fr));
+	gap: 5px;
+}
+
+/* 在 Vue 3 中使用 :deep() 替代 >>> */
+:deep(.total-input .el-input__inner) {
+	font-weight: bold;
+	color: #409eff;
+}
+</style>
diff --git a/src/components/NGTools/NGResult.vue b/src/components/NGTools/NGResult.vue
new file mode 100644
index 0000000..683543c
--- /dev/null
+++ b/src/components/NGTools/NGResult.vue
@@ -0,0 +1,326 @@
+<template>
+	<div class="app-container">
+		<!--  <div>当前 dMeterType 的值: {{ dMeterType }}</div>
+    <div>NGResult 数据: {{ NGResult }}</div> -->
+		<h3 v-if="dMeterType === '4'">GB/T 17747</h3>
+		<el-form v-if="dMeterType === '4'" :model="NGResult" label-position="top" ref="queryRef" size="small" :inline="false" label-width="160px" class="flex-form">
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="分子量" prop="dMrx">
+				<el-input readonly v-model="NGResult.dMrx" placeholder="请输入分子量" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="标况压缩因子" prop="dZb">
+				<el-input readonly v-model="NGResult.dZb" placeholder="请输入标况压缩因子" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="工况压缩因子" prop="dZf">
+				<el-input readonly v-model="NGResult.dZf" placeholder="请输入工况压缩因子" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="超压缩系数" prop="dFpv">
+				<el-input readonly v-model="NGResult.dFpv" placeholder="请输入超压缩系数" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="标况摩尔密度" prop="dDb">
+				<el-input readonly v-model="NGResult.dDb" placeholder="请输入标况摩尔密度" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="工况摩尔密度" prop="dDf">
+				<el-input readonly v-model="NGResult.dDf" placeholder="请输入工况摩尔密度" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="标况质量密度" prop="dRhob">
+				<el-input readonly v-model="NGResult.dRhob" placeholder="请输入标况质量密度" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="工况质量密度" prop="dRhof">
+				<el-input readonly v-model="NGResult.dRhof" placeholder="请输入工况质量密度" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="理想气体的相对密度" prop="dRD_Ideal">
+				<el-input readonly v-model="NGResult.dRD_Ideal" placeholder="请输入理想气体的相对密度" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="真实气体的相对密度" prop="dRD_Real">
+				<el-input readonly v-model="NGResult.dRD_Real" placeholder="请输入真实气体的相对密度" />
+			</el-form-item>
+		</el-form>
+
+		<h3 v-if="dMeterType === '5'">AGA No10</h3>
+		<el-form v-if="dMeterType === '5'" :model="NGResult" label-position="top" ref="queryRef" size="small" :inline="false" label-width="160px" class="flex-form">
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="理想气体的比焓" prop="dHo">
+				<el-input readonly v-model="NGResult.dHo" placeholder="请输入理想气体的比焓" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="真实气体的焓" prop="dH">
+				<el-input readonly v-model="NGResult.dH" placeholder="请输入真实气体的焓" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="真实气体的熵" prop="dS">
+				<el-input readonly v-model="NGResult.dS" placeholder="请输入真实气体的熵" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="理想气体定压热容" prop="dCpi">
+				<el-input readonly v-model="NGResult.dCpi" placeholder="请输入理想气体定压热容" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="定压热容" prop="dCp">
+				<el-input readonly v-model="NGResult.dCp" placeholder="请输入定压热容" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="定容积热容" prop="dCv">
+				<el-input readonly v-model="NGResult.dCv" placeholder="请输入定容积热容" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="比热比" prop="dk">
+				<el-input readonly v-model="NGResult.dk" placeholder="请输入比热比" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="等熵指数" prop="dKappa">
+				<el-input readonly v-model="NGResult.dKappa" placeholder="请输入等熵指数" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="声速" prop="dSOS">
+				<unit-converter
+					v-model="NGResult.dSOS"
+					:unit-type="'speed'"
+					v-model:unit-order="NGResult.dSOSUnit"
+					:show-english-only="true"
+					:decimal-places="5"
+					:input-disable="true"
+					:width="selectWidth"
+				/>
+				<!-- <el-input readonly v-model="NGResult.dSOS" placeholder="请输入声速" /> -->
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="临界流函数" prop="dCstar">
+				<el-input readonly v-model="NGResult.dCstar" placeholder="请输入临界流函数" />
+			</el-form-item>
+		</el-form>
+
+		<h3 v-if="dMeterType === '6'">GB/T 11062</h3>
+		<el-form v-if="dMeterType === '6'" :model="NGResult" label-position="top" ref="queryRef" size="small" :inline="false" label-width="160px" class="flex-form">
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="摩尔高位发热量" prop="dHhvMol">
+				<el-input readonly v-model="NGResult.dHhvMol" placeholder="请输入摩尔高位发热量" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="摩尔低位发热量" prop="dLhvMol">
+				<el-input readonly v-model="NGResult.dLhvMol" placeholder="请输入摩尔低位发热量" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="体积高位发热量" prop="dHhvv">
+				<el-input readonly v-model="NGResult.dHhvv" placeholder="请输入体积高位发热量" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="体积低位发热量" prop="dLhvv">
+				<el-input readonly v-model="NGResult.dLhvv" placeholder="请输入体积低位发热量" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="质量高位发热量" prop="dHhvm">
+				<el-input readonly v-model="NGResult.dHhvm" placeholder="请输入质量高位发热量" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="质量地位发热量" prop="dLhvm">
+				<el-input readonly v-model="NGResult.dLhvm" placeholder="请输入质量地位发热量" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="标况压缩因子" prop="dZb11062">
+				<el-input readonly v-model="NGResult.dZb11062" placeholder="请输入标况压缩因子" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="标况质量密度" prop="dRhob11062">
+				<el-input readonly v-model="NGResult.dRhob11062" placeholder="请输入标况质量密度" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="工况质量密度" prop="dRhof11062">
+				<el-input readonly v-model="NGResult.dRhof11062" placeholder="请输入工况质量密度" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="理想气体的相对密度" prop="dRD_Ideal11062">
+				<el-input readonly v-model="NGResult.dRD_Ideal11062" placeholder="请输入理想气体的相对密度" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="真实气体的相对密度" prop="dRD_Real11062">
+				<el-input readonly v-model="NGResult.dRD_Real11062" placeholder="请输入真实气体的相对密度" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="真实气体的沃泊指数" prop="dWobbeIndex">
+				<el-input readonly v-model="NGResult.dWobbeIndex" placeholder="请输入真实气体的沃泊指数" />
+			</el-form-item>
+		</el-form>
+
+		<h3 v-if="dMeterType === '7'">其他</h3>
+		<el-form v-if="dMeterType === '7'" :model="NGResult" label-position="top" ref="queryRef" size="small" :inline="false" label-width="160px" class="flex-form">
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="临界压力" prop="dPc">
+				<el-input readonly v-model="NGResult.dPc" placeholder="请输入临界压力" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="临界温度" prop="dTC">
+				<el-input readonly v-model="NGResult.dTC" placeholder="请输入临界温度" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="爆炸上限" prop="dBzsx">
+				<el-input readonly v-model="NGResult.dBzsx" placeholder="请输入爆炸上限" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="爆炸下限" prop="dBzxx">
+				<el-input readonly v-model="NGResult.dBzxx" placeholder="请输入爆炸下限" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="总炭含量(kg/m3)" prop="dTotalC">
+				<el-input readonly v-model="NGResult.dTotalC" placeholder="请输入总炭含量(kg/m3)" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="C2组分含量(kg/m3)" prop="dC2">
+				<el-input readonly v-model="NGResult.dC2" placeholder="请输入C2组分含量(kg/m3)" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="C2以上组分含量(kg/m3)" prop="dC2j">
+				<el-input readonly v-model="NGResult.dC2j" placeholder="请输入C2以上组分含量(kg/m3)" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="C3以上组分含量(kg/m3)" prop="dC3j">
+				<el-input readonly v-model="NGResult.dC3j" placeholder="请输入C3以上组分含量(kg/m3)" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="C4以上组分含量(kg/m3)" prop="dC4j">
+				<el-input readonly v-model="NGResult.dC4j" placeholder="请输入C4以上组分含量(kg/m3)" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="C5以上组分含量(kg/m3)" prop="dC5j">
+				<el-input readonly v-model="NGResult.dC5j" placeholder="请输入C5以上组分含量(kg/m3)" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="C6以上组分含量(kg/m3)" prop="dC6j">
+				<el-input readonly v-model="NGResult.dC6j" placeholder="请输入C6以上组分含量(kg/m3)" />
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="C3C4组分含量(kg/m3)" prop="dC3C4">
+				<el-input readonly v-model="NGResult.dC3C4" placeholder="请输入C3C4组分含量(kg/m3)" />
+			</el-form-item>
+		</el-form>
+	</div>
+</template>
+
+<script setup>
+import { ref, watch, onMounted } from 'vue';
+import unitConverter from '@/components/inputValueUnit/index';
+
+// 定义 props
+const props = defineProps({
+	elFormWidth: {
+		type: Number,
+		default: 180
+	},
+	dMeterType: {
+		type: String,
+		default: 0
+	},
+	modelValue: {
+		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
+		})
+	}
+});
+
+// 定义响应式数据
+const NGResult = ref({
+	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,
+	dSOSUnit: 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
+});
+const selectWidth = ref(180);
+
+// 监听 elFormWidth 的变化
+watch(
+	() => props.elFormWidth,
+	(newVal) => {
+		selectWidth.value = newVal;
+	},
+	{ deep: true }
+);
+
+// 监听 value 的变化
+watch(
+	() => props.modelValue,
+	(newVal) => {
+		console.log(newVal);
+		const processedValue = { ...newVal };
+		for (const key in processedValue) {
+			if (processedValue.hasOwnProperty(key)) {
+				const value = processedValue[key];
+				// 判断是否为有效的数值
+				if (typeof value === 'number' && !isNaN(value) && isFinite(value)) {
+					// 使用 toFixed 方法设置小数点位数
+					processedValue[key] = parseFloat(value.toFixed(6));
+				}
+			}
+		}
+		NGResult.value = JSON.parse(JSON.stringify(processedValue));
+	},
+	{ deep: true }
+);
+
+// 挂载后设置 selectWidth
+onMounted(() => {
+	selectWidth.value = props.elFormWidth;
+});
+</script>
+
+<style scoped>
+/* 可按需添加样式 */
+.app-container {
+	height: 100%;
+}
+.flex-form {
+	display: grid;
+	/* 优化后的自适应规则 */
+	grid-template-columns: repeat(auto-fit, minmax(min(200px, 100%), 1fr));
+	gap: 5px;
+}
+</style>
diff --git a/src/components/NGTools/meterPar.vue b/src/components/NGTools/meterPar.vue
new file mode 100644
index 0000000..8a9b1ae
--- /dev/null
+++ b/src/components/NGTools/meterPar.vue
@@ -0,0 +1,422 @@
+<template>
+	<div class="app-container">
+		<el-form :model="meterPar" ref="dataForm" label-position="top" size="small" :inline="true" label-width="160px" class="flex-form">
+			<el-form-item v-if="['0', '1', '2', '3'].includes(meterPar.dMeterType)" :style="{ width: selectWidth + 'px' }" label="流量计类别" prop="dMeterType">
+				<el-select :key="'meter-type-' + meterPar.dMeterType" v-model="meterPar.dMeterType" placeholder="请选择流量计类别 " clearable>
+					<el-option v-for="dict in ngtools_lljlx" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item v-if="meterPar.dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="计算标准" prop="dFlowCalbz">
+				<el-select v-model="meterPar.dFlowCalbz" placeholder="请选择计算标准 " clearable>
+					<el-option v-for="dict in ngtools_lljsbz" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="压缩因子计算标准" prop="dZcalbz">
+				<el-select v-model="meterPar.dZcalbz" placeholder="请选择压缩因子计算标准 " clearable>
+					<el-option v-for="dict in ngtools_ysyzjsbz" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="计量参比条件压力" prop="dCbtj">
+				<el-select v-model="meterPar.dCbtj" placeholder="请选择计量参比条件压力 " clearable>
+					<el-option v-for="dict in ngtools_cbtj" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+
+			<el-form-item v-if="meterPar.dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="节流装置类型" prop="dCoreType">
+				<el-select v-model="meterPar.dCoreType" placeholder="请选择节流装置类型 " clearable>
+					<el-option v-for="dict in ngtools_jlzzlx" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item v-if="meterPar.dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="取压方式" prop="dPtmode">
+				<el-select v-model="meterPar.dPtmode" placeholder="请选择取压方式 " clearable>
+					<el-option v-for="dict in ngtools_qyfs" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item v-if="meterPar.dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="管道类型" prop="dPipeType">
+				<el-select v-model="meterPar.dPipeType" placeholder="请选择管道类型 " clearable>
+					<el-option v-for="dict in ngtools_gdlx" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+
+			<el-form-item v-if="meterPar.dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="管道材料" prop="dPipeMaterial">
+				<el-select v-model="meterPar.dPipeMaterial" placeholder="请选择管道材料 " clearable>
+					<el-option v-for="dict in ngtools_gdcz" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+
+			<el-form-item v-if="meterPar.dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="孔板材料" prop="dOrificeMaterial">
+				<el-select v-model="meterPar.dOrificeMaterial" placeholder="请选择孔板材料 " clearable>
+					<el-option v-for="dict in ngtools_gdcz" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+
+			<el-form-item v-if="meterPar.dMeterType === '0' || meterPar.dMeterType === '3'" :style="{ width: selectWidth + 'px' }" label="管道内径" prop="dPipeD">
+				<unit-converter
+					v-model="meterPar.dPipeD"
+					:unit-type="'length'"
+					v-model:unit-order="meterPar.dLenUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+
+			<el-form-item v-if="meterPar.dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="孔板孔径" prop="dOrificeD">
+				<unit-converter
+					v-model="meterPar.dOrificeD"
+					:unit-type="'length'"
+					v-model:unit-order="meterPar.dOrificeUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+			<el-form-item v-if="meterPar.dMeterType === '3'" :style="{ width: selectWidth + 'px' }" label="喉部直径" prop="dOrificeD">
+				<unit-converter
+					v-model="meterPar.dOrificeD"
+					:unit-type="'length'"
+					v-model:unit-order="meterPar.dOrificeUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="压力类型" prop="dPfType">
+				<el-select v-model="meterPar.dPfType" placeholder="请选择压力类型 " clearable>
+					<el-option v-for="dict in ngtools_yllx" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item v-if="meterPar.dPfType === '0'" :style="{ width: selectWidth + 'px' }" label="当地大气压" prop="dPatm">
+				<unit-converter
+					v-model="meterPar.dPatm"
+					:unit-type="'pressure'"
+					v-model:unit-order="meterPar.dPatmUnit"
+					:show-english-only="false"
+					:decimal-places="6"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="输入压力" prop="dPf">
+				<unit-converter
+					v-model="meterPar.dPf"
+					:unit-type="'pressure'"
+					v-model:unit-order="meterPar.dPfUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="输入温度" prop="dTf">
+				<unit-converter
+					v-model="meterPar.dTf"
+					:unit-type="'temperature'"
+					v-model:unit-order="meterPar.dTfUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+			<el-form-item v-if="meterPar.dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="输入差压" prop="dDp">
+				<unit-converter
+					v-model="meterPar.dDp"
+					:unit-type="'pressure'"
+					v-model:unit-order="meterPar.dDpUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+
+			<!--  <el-form-item :style="{ width: selectWidth + 'px' }"    label="体积流量单位" prop="dVFlowUnit">
+        <el-input v-model="meterPar.dVFlowUnit" placeholder="请输入体积流量单位 " clearable  />
+      </el-form-item >
+      <el-form-item :style="{ width: selectWidth + 'px' }"    label="质量流量单位" prop="dMFlowUnit">
+        <el-input v-model="meterPar.dMFlowUnit" placeholder="请输入质量流量单位 " clearable  />
+      </el-form-item >
+      <el-form-item :style="{ width: selectWidth + 'px' }"    label="能量流量单位" prop="dEFlowUnit">
+        <el-input v-model="meterPar.dEFlowUnit" placeholder="请输入能量流量单位 " clearable  />
+      </el-form-item > -->
+
+			<el-form-item v-if="meterPar.dMeterType === '3'" :style="{ width: selectWidth + 'px' }" label="流出系数" prop="dCd">
+				<el-input v-model="meterPar.dCd" placeholder="请输入流出系数 " clearable />
+			</el-form-item>
+			<!-- <el-form-item :style="{ width: selectWidth + 'px' }"    label="流出系数计算方法" prop="dCdCalMethod">
+        <el-select  v-model="meterPar.dCdCalMethod" placeholder="请选择流出系数计算方法 " clearable >
+          <el-option  v-for="dict in ngtools_lcxsjsff" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item > -->
+			<el-form-item v-if="meterPar.dMeterType === '1' || meterPar.dMeterType === '2'" :style="{ width: selectWidth + 'px' }" label="仪表系数" prop="dMeterFactor">
+				<el-input v-model="meterPar.dMeterFactor" placeholder="请输入仪表系数 " clearable />
+			</el-form-item>
+			<el-form-item v-if="meterPar.dMeterType === '1' || meterPar.dMeterType === '2'" :style="{ width: selectWidth + 'px' }" label="脉冲数" prop="dPulseNum">
+				<unit-converter
+					v-model="meterPar.dPulseNum"
+					:unit-type="'user'"
+					v-model:unit-order="meterPar.dVGscUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:user-defined="true"
+					:user-definedunit-name="'个'"
+					:enable-convert="false"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+
+			<el-form-item v-if="meterPar.dMeterType === '5'" :style="{ width: selectWidth + 'px' }" label="管束车容积" prop="dVGsc">
+				<unit-converter
+					v-model="meterPar.dVGsc"
+					:unit-type="'volume'"
+					v-model:unit-order="meterPar.dVGscUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="最大体积流量" prop="dVFlowMax">
+				<unit-converter
+					v-model="meterPar.dVFlowMax"
+					:unit-type="'volumeflow'"
+					v-model:unit-order="meterPar.dVFlowUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="最小体积流量" prop="dVFlowMin">
+				<unit-converter
+					v-model="meterPar.dVFlowMin"
+					:unit-type="'volumeflow'"
+					v-model:unit-order="meterPar.dVFlowUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="常用流量" prop="dVFlowCon">
+				<unit-converter
+					v-model="meterPar.dVFlowCon"
+					:unit-type="'volumeflow'"
+					v-model:unit-order="meterPar.dVFlowUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:enable-convert="true"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="压力量程下限" prop="dPfRangeMin">
+				<unit-converter
+					v-model="meterPar.dPfRangeMin"
+					:unit-type="'pressure'"
+					v-model:unit-order="meterPar.dPfUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="压力量程上限" prop="dPfRangeMax">
+				<unit-converter
+					v-model="meterPar.dPfRangeMax"
+					:unit-type="'pressure'"
+					v-model:unit-order="meterPar.dPfUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="差压量程下限" prop="dDpRangeMin">
+				<unit-converter
+					v-model="meterPar.dDpRangeMin"
+					:unit-type="'pressure'"
+					v-model:unit-order="meterPar.dDpUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="差压量程上限" prop="dDpRangeMax">
+				<unit-converter
+					v-model="meterPar.dDpRangeMax"
+					:unit-type="'pressure'"
+					v-model:unit-order="meterPar.dDpUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="温度计量程下限" prop="dTfRangeMin">
+				<unit-converter
+					v-model="meterPar.dTfRangeMin"
+					:unit-type="'temperature'"
+					v-model:unit-order="meterPar.dTfUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="温度计量程上限" prop="dTfRangeMax">
+				<unit-converter
+					v-model="meterPar.dTfRangeMax"
+					:unit-type="'temperature'"
+					v-model:unit-order="meterPar.dTfUnit"
+					:show-english-only="false"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+		</el-form>
+	</div>
+</template>
+<script setup>
+import { ref, watch, onMounted, toRefs } from 'vue';
+import _ from 'lodash';
+import unitConverter from '@/components/inputValueUnit/index';
+
+// 定义组件名称
+const __name = 'meterParComponents';
+const { proxy } = getCurrentInstance();
+// 定义字典数组
+const { ngtools_cbtj, ngtools_jlzzlx, ngtools_lljlx, ngtools_qyfs, ngtools_gdcz, ngtools_lcxsjsff, ngtools_gdlx, ngtools_yllx, ngtools_lljsbz, ngtools_ysyzjsbz } = proxy.useDict(
+	'ngtools_cbtj',
+	'ngtools_jlzzlx',
+	'ngtools_lljlx',
+	'ngtools_qyfs',
+	'ngtools_gdcz',
+	'ngtools_lcxsjsff',
+	'ngtools_gdlx',
+	'ngtools_yllx',
+	'ngtools_lljsbz',
+	'ngtools_ysyzjsbz'
+);
+
+// 定义 props
+const props = defineProps({
+	modelValue: {
+		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,
+			dCalcType: 0, // 0 流量 1  天然气  3 管束车
+			dBqdd: 0 // 0 不计算，1 计算
+		})
+	},
+	elFormWidth: {
+		type: Number,
+		default: 180
+	}
+});
+
+// 定义 emits
+const emits = defineEmits(['update:modelValue']); // 修改事件名称
+
+// 定义响应式数据
+const selectWidth = ref(0);
+const meterPar = ref(_.cloneDeep(props.value));
+const isUpdating = ref(false);
+
+// 在挂载后设置 selectWidth
+onMounted(() => {
+	selectWidth.value = props.elFormWidth;
+});
+
+// 对 meterPar 进行深度监听
+watch(
+	meterPar,
+	(newVal) => {
+		if (!_.isEqual(newVal, props.value)) {
+			console.log('Emit to parent', newVal);
+			emits('update:modelValue', _.cloneDeep(newVal));
+		}
+	},
+	{ deep: true }
+);
+
+// 对 elFormWidth 进行监听
+watch(
+	() => props.elFormWidth,
+	(newVal) => {
+		selectWidth.value = newVal;
+	},
+	{ deep: true }
+);
+
+// 对 value 进行深度监听
+watch(
+	() => props.modelValue,
+	(newVal, oldVal) => {
+		if (!_.isEqual(newVal, meterPar.value)) {
+			console.log('Update from parent', newVal);
+			meterPar.value = _.cloneDeep({
+				...newVal,
+				dMeterType: String(newVal.dMeterType) // 强制类型转换
+			});
+		}
+	},
+	{ deep: true, immediate: true }
+);
+</script>
+
+<style scoped>
+/* 在这里可以添加一些样式 */
+.app-container {
+	height: 100%;
+}
+.flex-form {
+	display: grid;
+	/* 优化后的自适应规则 */
+	grid-template-columns: repeat(auto-fit, minmax(min(200px, 100%), 1fr));
+	gap: 5px;
+}
+</style>
diff --git a/src/components/NGTools/meterResult.vue b/src/components/NGTools/meterResult.vue
new file mode 100644
index 0000000..09e3b14
--- /dev/null
+++ b/src/components/NGTools/meterResult.vue
@@ -0,0 +1,231 @@
+<template>
+	<div class="app-container">
+		<el-form :model="meterResult" label-position="top" ref="queryRef" size="small" :inline="false" label-width="160px" class="flex-form">
+			<el-form-item :style="{ width: selectWidth + 'px' }" label="标况体积流量m³/s" prop="dVFlowb">
+				<unit-converter
+					v-model="meterResult.dVFlowb"
+					:unit-type="'volumeflow'"
+					v-model:unit-order="meterResult.dVFlowUnit"
+					:show-english-only="true"
+					:decimal-places="5"
+					:width="selectWidth"
+					:input-disable="true"
+				/>
+			</el-form-item>
+			<el-form-item label="工况体积流量" prop="dVFlowf">
+				<unit-converter
+					v-model="meterResult.dVFlowf"
+					:unit-type="'volumeflow'"
+					v-model:unit-order="meterResult.dVFlowWorkUnit"
+					:show-english-only="true"
+					:decimal-places="5"
+					:input-disable="true"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+			<el-form-item label="标况质量流量" prop="dMFlowb">
+				<unit-converter
+					v-model="meterResult.dMFlowb"
+					:unit-type="'massflow'"
+					v-model:unit-order="meterResult.dMFlowUnit"
+					:input-disable="true"
+					:show-english-only="true"
+					:decimal-places="5"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+			<el-form-item label="标况能量流量" prop="dEFlowb">
+				<unit-converter
+					v-model="meterResult.dEFlowb"
+					:unit-type="'energyflow'"
+					v-model:unit-order="meterResult.dEFlowUnit"
+					:show-english-only="true"
+					:decimal-places="5"
+					:width="selectWidth"
+					:input-disable="true"
+				/>
+			</el-form-item>
+			<el-form-item v-if="dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="求渐近速度系数 E" prop="dE">
+				<el-input class="el-input" readonly v-model="meterResult.dE" placeholder=" " />
+			</el-form-item>
+			<el-form-item v-if="dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="求相对密度系数 FG" prop="dFG">
+				<el-input readonly v-model="meterResult.dFG" placeholder=" " />
+			</el-form-item>
+			<el-form-item v-if="dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="求流动温度系数 FT" prop="dFT">
+				<el-input readonly v-model="meterResult.dFT" placeholder="" />
+			</el-form-item>
+			<el-form-item v-if="dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="求动力粘度dlnd" prop="dDViscosity">
+				<el-input readonly v-model="meterResult.dDViscosity" placeholder="" />
+			</el-form-item>
+			<el-form-item v-if="dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="求可膨胀系数" prop="dDExpCoefficient">
+				<el-input readonly v-model="meterResult.dDExpCoefficient" placeholder="" />
+			</el-form-item>
+			<el-form-item v-if="dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="管道雷诺数" prop="dRnPipe">
+				<el-input readonly v-model="meterResult.dRnPipe" placeholder="" />
+			</el-form-item>
+
+			<el-form-item v-if="dMeterType === '3'" :style="{ width: selectWidth + 'px' }" label="修正后的流出系数" prop="dCdCorrect">
+				<el-input readonly v-model="meterResult.dCdCorrect" placeholder="" />
+			</el-form-item>
+			<el-form-item v-if="dMeterType === '3'" :style="{ width: selectWidth + 'px' }" label="喷嘴的流出系数" prop="dCdNozell">
+				<el-input readonly v-model="meterResult.dCdNozell" placeholder="" />
+			</el-form-item>
+
+			<el-form-item v-if="dMeterType === '0'" label="管道内天然气流速" prop="dVelocityFlow">
+				<unit-converter
+					v-model="meterResult.dVelocityFlow"
+					:unit-type="'speed'"
+					v-model:unit-order="meterResult.dVelocityUnit"
+					:show-english-only="true"
+					:decimal-places="5"
+					:input-disable="true"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+			<el-form-item v-if="dMeterType === '0'" label="压力损失" prop="dPressLost">
+				<unit-converter
+					v-model="meterResult.dPressLost"
+					:unit-type="'pressure'"
+					v-model:unit-order="meterResult.dPressLostUnit"
+					:show-english-only="true"
+					:decimal-places="5"
+					:input-disable="true"
+					:width="selectWidth"
+				/>
+			</el-form-item>
+			<el-form-item v-if="dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="直径比" prop="dBeta">
+				<el-input readonly v-model="meterResult.dBeta" placeholder="" />
+			</el-form-item>
+			<el-form-item v-if="dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="等熵指数" prop="dKappa">
+				<el-input readonly v-model="meterResult.dKappa" placeholder="" />
+			</el-form-item>
+			<el-form-item v-if="dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="孔板锐利度系数Bk" prop="dBk">
+				<el-input readonly v-model="meterResult.dBk" placeholder="" />
+			</el-form-item>
+			<el-form-item v-if="dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="管道粗糙度系数 Gme" prop="dRoughNessPipe">
+				<el-input readonly v-model="meterResult.dRoughNessPipe" placeholder="" />
+			</el-form-item>
+		</el-form>
+	</div>
+</template>
+<script setup>
+import { ref, watch, onMounted } from 'vue';
+import unitConverter from '@/components/inputValueUnit/index';
+
+// 定义 props
+const props = defineProps({
+	modelValue: {
+		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
+		})
+	},
+	elFormWidth: {
+		type: Number,
+		default: 180
+	},
+	dMeterType: {
+		type: String,
+		default: '0'
+	}
+});
+
+// 定义响应式数据
+const meterResult = ref({
+	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
+});
+const selectWidth = ref(0);
+
+// 监听 elFormWidth 的变化
+watch(
+	() => props.elFormWidth,
+	(newVal) => {
+		selectWidth.value = newVal;
+	},
+	{ deep: true }
+);
+
+// 监听 value 的变化
+watch(
+	() => props.modelValue,
+	(newVal) => {
+		console.log(newVal);
+		const processedValue = { ...newVal };
+		for (const key in processedValue) {
+			if (processedValue.hasOwnProperty(key)) {
+				const value = processedValue[key];
+				// 判断是否为有效的数值
+				if (typeof value === 'number' && !isNaN(value) && isFinite(value)) {
+					// 使用 toFixed 方法设置小数点位数
+					processedValue[key] = parseFloat(value.toFixed(6));
+				}
+			}
+		}
+		meterResult.value = JSON.parse(JSON.stringify(processedValue));
+	},
+	{ deep: true }
+);
+
+// 挂载后设置 selectWidth
+onMounted(() => {
+	// 在 DOM 更新后获取宽度
+	selectWidth.value = props.elFormWidth;
+});
+</script>
+
+<style scoped>
+/* 可按需添加样式 */
+.app-container {
+	height: 100%;
+}
+.flex-form {
+	display: grid;
+	/* 优化后的自适应规则 */
+	grid-template-columns: repeat(auto-fit, minmax(min(200px, 100%), 1fr));
+	gap: 10px;
+}
+</style>
diff --git a/src/components/inputValueUnit/index.vue b/src/components/inputValueUnit/index.vue
new file mode 100644
index 0000000..af26c04
--- /dev/null
+++ b/src/components/inputValueUnit/index.vue
@@ -0,0 +1,482 @@
+<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"
+		/>
+		<!-- 单位标签 -->
+		<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-for="unit in sortedUnits" :key="unit.id" @click="selectUnit(unit)" class="unit-option">
+				{{ showEnglishOnly ? unit.unitName.split('(')[0] : unit.unitName }}
+			</div>
+		</div>
+	</div>
+</template>
+
+<script setup>
+import { ref, watch, onMounted, onBeforeUnmount, computed, nextTick } from 'vue';
+import { listSysUnitConvert } from '@/api/system/sysUnitConvert.js';
+
+// 定义 props
+const props = defineProps({
+	unitType: {
+		// 当前单位类型 (required)
+		type: String,
+		required: true
+	},
+	unitOrder: {
+		// 当前单位序号 (sync)
+		type: Number,
+		default: 0
+	},
+	modelValue: {
+		// 输入数值 (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: 24
+	},
+	enableConvert: {
+		//是否能够进行单位换算
+		type: Boolean,
+		default: true
+	},
+	userDefined: {
+		//自定义输入单位显示
+		type: Boolean,
+		default: false
+	},
+	userDefinedunitName: {
+		//自定义输入单位显示
+		type: String,
+		default: ''
+	},
+	inputDisable: {
+		type: Boolean,
+		required: false,
+		default: false
+	}
+});
+
+// 定义 emits
+// 修改2：调整emits定义
+const emits = defineEmits([
+	'update:modelValue', // 替换原来的update:value
+	'update:unitOrder', // 保持原有事件
+	'conversion'
+]);
+
+// 定义响应式数据
+// 修改3：调整所有value相关操作
+const inputValue = ref(props.modelValue); // 初始化使用modelValue
+const unitData = ref([]); // 原始单位数据
+const showUnitSelector = ref(false); // 显示选择器
+const currentUnit = ref(null); // 当前选中单位
+const baseUnit = ref(null); // 基准单位
+const inputWidth = ref(120); //输入框的宽度
+const textUnitName = ref('');
+const unitSelectorLeft = ref(0);
+const unitSelectorTop = ref(0);
+// 新增三个数据项
+const originalValue = ref(props.value); // 原始输入值
+const originalUnit = ref(null); // 原始输入单位
+const isInternalUpdate = ref(false); // 更新锁定标志
+
+// 定义 ref
+const inputRef = ref(null);
+const unitLabel = ref(null);
+const unitSelector = ref(null);
+
+// 计算属性
+const displayUnitText = computed(() => {
+	if (!currentUnit.value) return '';
+	return props.showEnglishOnly ? currentUnit.value.unitName.split('(')[0].trim() : currentUnit.value.unitName;
+});
+
+const sortedUnits = computed(() => {
+	return unitData.value.filter((u) => u.unitType === props.unitType).sort((a, b) => a.unitOrder - b.unitOrder);
+});
+
+const popupPosition = computed(() => {
+	if (!unitLabel.value) return {};
+	const rect = unitLabel.value.getBoundingClientRect();
+	return {
+		top: `${rect.bottom + window.scrollY}px`,
+		left: `${rect.left + window.scrollX}px`
+	};
+});
+
+// 安全宽度更新方法
+const safeUpdateWidth = () => {
+	if (unitLabel.value) {
+		updateInputWidth();
+	}
+};
+
+const selectAllText = (event) => {
+	// 通过 event.target 获取触发事件的 input 元素
+	const input = event.target;
+	// 调用 select() 方法全选文本
+	input.select();
+};
+
+const handleMouseMove = (event) => {
+	if (showUnitSelector.value) {
+		// 鼠标右下方偏移量
+		const offsetX = 10;
+		const offsetY = 10;
+		unitSelectorLeft.value = event.clientX;
+		unitSelectorTop.value = event.clientY + offsetY - 100;
+		// 获取弹窗元素
+		if (unitSelector.value) {
+			// 检查是否超出屏幕右边界
+			if (unitSelectorLeft.value + unitSelector.value.offsetWidth > window.innerWidth) {
+				unitSelectorLeft.value = window.innerWidth - unitSelector.value.offsetWidth;
+			}
+			// 检查是否超出屏幕下边界
+			if (unitSelectorTop.value + unitSelector.value.offsetHeight > window.innerHeight) {
+				unitSelectorTop.value = window.innerHeight - unitSelector.value.offsetHeight;
+			}
+		}
+	}
+};
+
+const updateInputWidth = () => {
+	// 安全访问检查
+	if (!unitLabel.value) {
+		console.warn('Unit label ref not available');
+		return;
+	}
+
+	const spanWidth = unitLabel.value.offsetWidth + 10;
+	inputWidth.value = Math.max(50, props.width - spanWidth); // 添加最小宽度限制
+};
+
+// 处理全局点击事件
+const handleClickOutside = (event) => {
+	if (unitSelector.value && !unitSelector.value.contains(event.target)) {
+		showUnitSelector.value = false;
+	}
+};
+
+// 切换单位选择器的显示状态
+const toggleUnitSelector = () => {
+	showUnitSelector.value = !showUnitSelector.value;
+};
+
+// 加载单位数据
+const loadUnits = async (unitType) => {
+	try {
+		const res = await listSysUnitConvert({
+			unitType: unitType,
+			status: 'Y'
+		});
+		unitData.value = res.rows;
+		baseUnit.value = unitData.value.find((u) => u.baseUnit === 'Y');
+	} catch (e) {
+		console.error('单位数据加载失败:', e);
+	}
+};
+
+// 初始化当前单位
+const initCurrentUnit = () => {
+	const target = sortedUnits.value.find((u) => u.unitOrder === props.unitOrder);
+	currentUnit.value = target || baseUnit.value || sortedUnits.value[0];
+	// 初始化时设置原始单位（关键修复）
+	originalUnit.value = currentUnit.value;
+	// 安全设置单位名称
+	textUnitName.value = currentUnit.value ? (props.showEnglishOnly ? currentUnit.value.unitName.split('(')[0].trim() : currentUnit.value.unitName) : '';
+	nextTick(() => {
+		updateInputWidth();
+	});
+};
+
+// 输入变化处理
+const handleInputChange = () => {
+	// 记录原始值和单位
+	originalValue.value = inputValue.value;
+	originalUnit.value = currentUnit.value;
+	emits('update:modelValue', inputValue.value); // 触发modelValue更新
+};
+
+// 循环切换单位
+const cycleUnit = () => {
+	const index = sortedUnits.value.findIndex((u) => u === currentUnit.value);
+	const newUnit = sortedUnits.value[(index + 1) % sortedUnits.value.length];
+	currentUnit.value = newUnit;
+	console.log(index, newUnit, currentUnit.value);
+	textUnitName.value = props.showEnglishOnly ? newUnit.unitName.split('(')[0].trim() : newUnit.unitName;
+	nextTick(() => {
+		if (unitLabel.value) {
+			updateInputWidth();
+			convertAndEmit();
+		}
+	});
+};
+
+// 选择单位
+const selectUnit = (unit) => {
+	currentUnit.value = unit;
+	showUnitSelector.value = false;
+	nextTick(() => {
+		updateInputWidth();
+		convertAndEmit(); // 触发转换
+	});
+};
+
+// 执行换算并提交事件
+const convertAndEmit = () => {
+	// 移除参数
+	if (!currentUnit.value || !baseUnit.value || !originalUnit.value) {
+		return;
+	}
+
+	let newValue = 0;
+	if (props.unitType === 'temperature') {
+		newValue = handleTemperatureConversion(originalUnit.value, currentUnit.value);
+	} else {
+		// 通过基准单位进行两次精确转换
+		const baseValue = originalValue.value / originalUnit.value.conversionFactor;
+		newValue = baseValue * currentUnit.value.conversionFactor;
+	}
+
+	const roundedValue = roundValue(newValue);
+	isInternalUpdate.value = true; // 锁定更新
+	inputValue.value = roundedValue;
+	// 同时触发两个更新事件
+	emits('update:modelValue', roundedValue);
+	emits('update:unitOrder', currentUnit.value.unitOrder);
+
+	emits('conversion', {
+		initialValue: originalValue.value,
+		newValue: roundedValue,
+		oldUnit: originalUnit.value.unitName,
+		newUnit: currentUnit.value.unitName,
+		oldOrder: originalUnit.value.unitOrder,
+		newOrder: currentUnit.value.unitOrder
+	});
+};
+
+// 温度单位换算
+const handleTemperatureConversion = (oldUnit, newUnit) => {
+	const oldOrder = oldUnit.unitOrder;
+	const newOrder = newUnit.unitOrder;
+	let celsius;
+	switch (oldOrder) {
+		case 0:
+			celsius = originalValue.value;
+			break;
+		case 1:
+			celsius = ((originalValue.value - 32) * 5) / 9;
+			break;
+		case 2:
+			celsius = originalValue.value - 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('无效温度单位');
+	}
+};
+
+// 四舍六入五成双
+const roundValue = (value) => {
+	const multiplier = Math.pow(10, props.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;
+	}
+};
+
+// 监听单位类型变化
+watch(
+	() => props.unitType,
+	async (newType) => {
+		if (props.userDefined) {
+			textUnitName.value = props.userDefinedunitName;
+			nextTick(() => {
+				safeUpdateWidth();
+			});
+		} else {
+			let temp = JSON.parse(localStorage.getItem('unitData'));
+			unitData.value = temp ? temp[newType] : [];
+			if (!unitData.value) {
+				await loadUnits(newType);
+			}
+			nextTick(() => {
+				baseUnit.value = unitData.value.find((u) => u.baseUnit === 'Y');
+				safeUpdateWidth();
+				initCurrentUnit();
+			});
+		}
+	},
+	{ immediate: true }
+);
+
+// 监听外部单位序号变化
+watch(
+	() => props.unitOrder,
+	(newOrder) => {
+		if (props.userDefined) {
+			textUnitName.value = props.userDefinedunitName;
+			nextTick(safeUpdateWidth);
+			return;
+		}
+		// 安全查找单位
+		const target = sortedUnits.value.find((u) => u.unitOrder === newOrder);
+		if (!target) {
+			console.warn(`单位序号 ${newOrder} 未找到，使用基准单位`);
+			currentUnit.value = baseUnit.value || sortedUnits.value[0];
+			textUnitName.value = currentUnit.value ? (props.showEnglishOnly ? currentUnit.value.unitName?.split('(')[0]?.trim() : currentUnit.value.unitName) : '';
+			return;
+		}
+		currentUnit.value = target;
+		textUnitName.value = props.showEnglishOnly ? target.unitName?.split('(')[0]?.trim() : target.unitName;
+
+		nextTick(safeUpdateWidth);
+	}
+);
+
+// 监听输入值变化
+watch(
+	() => props.modelValue,
+	(newVal) => {
+		console.log('收到父组件值更新:', newVal);
+		if (!isInternalUpdate.value && !isNaN(newVal)) {
+			originalValue.value = Number(newVal);
+			inputValue.value = originalValue.value;
+			console.log('外部更新处理:', {
+				original: originalValue.value,
+				input: inputValue.value
+			});
+		}
+		isInternalUpdate.value = false;
+	},
+	{ immediate: true, deep: true }
+);
+
+onMounted(() => {
+	nextTick(() => {
+		safeUpdateWidth();
+	});
+	// 在挂载时添加全局点击事件监听器
+	document.addEventListener('click', handleClickOutside);
+});
+
+onBeforeUnmount(() => {
+	// 清除所有未完成的异步操作
+	showUnitSelector.value = false;
+	document.removeEventListener('click', handleClickOutside);
+
+	// 清除引用
+	inputRef.value = null;
+	unitLabel.value = null;
+	unitSelector.value = null;
+});
+</script>
+
+<style scoped>
+.unit-converter {
+	display: flex;
+	align-items: center;
+	position: relative;
+}
+
+.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;
+	white-space: nowrap;
+	padding: 0 8px; /* 可根据需要调整左右内边距 */
+}
+
+.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: 180px;
+	list-style-type: none;
+	margin-left: 100px;
+}
+
+.unit-option {
+	padding: 2px 10px;
+	cursor: pointer;
+	font-size: 14px;
+}
+
+.unit-option:hover {
+	background-color: #f0f0f0;
+}
+</style>
diff --git a/src/views/index.vue b/src/views/index.vue
index d221efd..9836bcb 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,1095 +1,117 @@
-<template>
-  <div class="app-container home">
-    <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"
-            icon="Cloudy"
-            plain
-            @click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
-            >访问码云</el-button
-          >
-          <el-button
-            icon="HomeFilled"
-            plain
-            @click="goTarget('http://ruoyi.vip')"
-            >访问主页</el-button
-          >
-        </p>
-      </el-col>
-
-      <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">
-          <template v-slot:header>
-            <div class="clearfix">
-              <span>联系信息</span>
-            </div>
-          </template>
-          <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">
-          <template v-slot:header>
-            <div class="clearfix">
-              <span>更新日志</span>
-            </div>
-          </template>
-          <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>
-
-            <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>
-
-            <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">
-          <template v-slot:header>
-            <div class="clearfix">
-              <span>捐赠支持</span>
-            </div>
-          </template>
-          <div class="body">
-            <img
-              src="@/assets/images/pay.png"
-              alt="donate"
-              style="width:100%"
-            />
-            <span style="display: inline-block; height: 30px; line-height: 30px"
-              >你可以请作者喝杯咖啡表示鼓励</span
-            >
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script setup name="Index">
-const version = ref('3.8.9')
-
-function goTarget(url) {
-  window.open(url, '__blank')
-}
-</script>
-
-<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;
-  }
-
-  ul {
-    padding: 0;
-    margin: 0;
-  }
-
-  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  color: #676a6c;
-  overflow-x: hidden;
-
-  ul {
-    list-style-type: none;
-  }
-
-  h4 {
-    margin-top: 0px;
-  }
-
-  h2 {
-    margin-top: 10px;
-    font-size: 26px;
-    font-weight: 100;
-  }
-
-  p {
-    margin-top: 10px;
-
-    b {
-      font-weight: 700;
-    }
-  }
-
-  .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;
-    }
-  }
-}
-</style>
-
+<template>
+	<div class="app-container home"></div>
+</template>
+
+<script setup name="Index">
+import { listSysUnitConvert } from '@/api/system/sysUnitConvert';
+const unitData = ref([]);
+const queryParams = ref({
+	pageNum: 1,
+	pageSize: 1000,
+	unitType: null,
+	unitName: null,
+	baseUnit: null,
+	conversionFactor: null,
+	unitTypeName: null,
+	status: null,
+	unitOrder: null
+});
+
+// 获取路由实例
+const router = useRouter();
+// 保留原有单位换算方法
+const groupByUnitType = (data) => {
+	return data.reduce((acc, unit) => {
+		const type = unit.unitType;
+		if (!acc[type]) acc[type] = [];
+		acc[type].push({
+			id: unit.id,
+			unitType: unit.unitType,
+			unitName: unit.unitName,
+			conversionFactor: unit.conversionFactor,
+			unitOrder: unit.unitOrder,
+			baseUnit: unit.baseUnit,
+			status: unit.status,
+			unitTypeName: unit.unitTypeName
+		});
+		return acc;
+	}, {});
+};
+const getList = async () => {
+	try {
+		const response = await listSysUnitConvert(queryParams.value);
+		const unitDataGrouped = groupByUnitType(response.rows);
+		localStorage.setItem('unitData', JSON.stringify(unitDataGrouped));
+	} catch (error) {
+		console.error('获取单位数据失败:', error);
+	}
+};
+
+onMounted(() => {
+	getList();
+});
+</script>
+
+<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;
+	}
+
+	ul {
+		padding: 0;
+		margin: 0;
+	}
+
+	font-family: 'open sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+	font-size: 13px;
+	color: #676a6c;
+	overflow-x: hidden;
+
+	ul {
+		list-style-type: none;
+	}
+
+	h4 {
+		margin-top: 0px;
+	}
+
+	h2 {
+		margin-top: 10px;
+		font-size: 26px;
+		font-weight: 100;
+	}
+
+	p {
+		margin-top: 10px;
+
+		b {
+			font-weight: 700;
+		}
+	}
+
+	.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;
+		}
+	}
+}
+</style>
diff --git a/src/views/ngtools/FlowCal/index.vue b/src/views/ngtools/FlowCal/index.vue
new file mode 100644
index 0000000..197ffaa
--- /dev/null
+++ b/src/views/ngtools/FlowCal/index.vue
@@ -0,0 +1,325 @@
+<template>
+	<div>
+		<div style="text-align: center; margin-top: 10px; margin-bottom: 10px">
+			<button @click="btnCalc" type="primary" class="animated-button">{{ btnText }}</button>
+		</div>
+
+		<el-tabs v-model="activeTab" style="width: 100%">
+			<el-tab-pane label="工况参数" name="meterpar">
+				<meterPar v-model="parentMeterPar" :el-form-width="elFormItemWidth" />
+			</el-tab-pane>
+
+			<el-tab-pane label="摩尔组分" name="ngComponents">
+				<ngComponents v-model="parentMeterPar.dngComponents" :el-form-width="elFormItemWidthmin" />
+			</el-tab-pane>
+			<el-tab-pane label="计算结果" name="meterresult">
+				<meterResult v-if="['0', '1', '2', '3'].includes(dMeterType)" :d-meter-type="dMeterType" v-model="parentMeterResult" :el-form-width="elFormItemWidth" />
+				<NGResult v-if="['4', '5', '6', '7'].includes(dMeterType)" :d-meter-type="dMeterType" v-model="parentNGResult" :el-form-width="elFormItemWidthmin"></NGResult>
+			</el-tab-pane>
+		</el-tabs>
+
+		<div v-if="isShowMessage" class="message-box">{{ message }}</div>
+	</div>
+</template>
+
+<script setup>
+import { ref, onMounted, onBeforeMount, watch } from 'vue';
+import { useRoute } from 'vue-router';
+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';
+
+// 定义响应式数据
+const btnText = ref('');
+const elFormItemWidth = ref(160);
+const elFormItemWidthmin = ref(140);
+const activeTab = ref('meterpar');
+const isShowMessage = ref(false);
+const message = ref('');
+const parentMeterPar = ref({
+	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,
+	dCalcType: 0, //0 流量 1  天然气  3 管束车
+	dBqdd: 0 //0 不计算，1 计算  计算不确定度
+});
+
+const parentMeterResult = ref({
+	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
+});
+
+const parentNGResult = ref({
+	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,
+	dSOSUnit: 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
+});
+
+const componentString = ref('');
+const dMeterType = ref(0);
+
+// 获取路由信息
+const route = useRoute();
+
+// 在组件挂载前获取路由参数
+onBeforeMount(() => {
+	const params = route.query;
+	dMeterType.value = params.dMeterType;
+});
+
+// 在组件挂载后更新 parentMeterPar 的 dMeterType
+onMounted(() => {
+	parentMeterPar.value.dMeterType = dMeterType.value;
+});
+
+// 监听 dMeterType 的变化
+watch(dMeterType, (newValue) => {
+	if (['0', '1', '2', '3'].includes(newValue)) {
+		btnText.value = '计算流量';
+	} else if (newValue === '4') {
+		btnText.value = '计算压缩因子';
+	} else if (newValue === '5') {
+		btnText.value = '计算声速';
+	} else if (newValue === '6') {
+		btnText.value = '计算发热量';
+	} else if (newValue === '7') {
+		btnText.value = '计算其他参数';
+	}
+	parentMeterPar.value.dMeterType = newValue;
+	console.log('dMeterType 变化后，parentMeterPar:', parentMeterPar.value);
+});
+
+// 显示消息提示框
+const showMessage = () => {
+	isShowMessage.value = true;
+	setTimeout(() => {
+		isShowMessage.value = false;
+	}, 1000); // 1 秒后自动消失
+};
+
+// 计算按钮点击事件
+const btnCalc = () => {
+	if (['0', '1', '2', '3'].includes(dMeterType.value)) {
+		calcBtnFlow();
+	} else if (['4', '5', '6', '7'].includes(dMeterType.value)) {
+		calc();
+	}
+};
+
+// 计算天然气参数
+const calc = async () => {
+	console.log(parentMeterPar.value);
+	if (parentMeterPar.value.dngComponents === '') {
+		message.value = '组分为空，请输入天然气组分!';
+		showMessage();
+		activeTab.value = 'ngComponents';
+		return;
+	}
+	// 清空 parentNGResult 的值
+	for (const key in parentNGResult.value) {
+		if (parentNGResult.value.hasOwnProperty(key)) {
+			parentNGResult.value[key] = 0;
+		}
+	}
+	try {
+		const res = await calcNGPar(parentMeterPar.value);
+		parentNGResult.value = res.data;
+		activeTab.value = 'meterresult';
+		console.log('Response:', res);
+	} catch (error) {
+		console.error('Request error:', error);
+	}
+};
+
+// 计算流量
+const calcBtnFlow = async () => {
+	console.log(parentMeterPar.value);
+	if (parentMeterPar.value.dngComponents === '') {
+		message.value = '组分为空，请输入天然气组分!';
+		showMessage();
+		activeTab.value = 'ngComponents';
+		return;
+	}
+	// 清空 parentMeterResult 的值
+	for (const key in parentMeterResult.value) {
+		if (parentMeterResult.value.hasOwnProperty(key)) {
+			parentMeterResult.value[key] = 0;
+		}
+	}
+	try {
+		const res = await calcFlow(parentMeterPar.value);
+		parentMeterResult.value = res.data[0];
+		console.log('Response:', parentMeterResult.value);
+		activeTab.value = '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:last-child {
+	margin-right: 0;
+}
+
+.animated-button:hover {
+	background-color: #0056b3;
+	transform: scale(1.05);
+}
+
+.animated-button:active {
+	transform: scale(0.95);
+}
+
+/* 在 Vue 3 中使用 :deep() 替代 /deep/ */
+:deep(.el-tabs__nav) {
+	padding: 0;
+	margin: 0;
+	display: flex;
+	width: 100%;
+}
+
+: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;
+}
+</style>
diff --git a/src/views/ngtools/components/index.vue b/src/views/ngtools/components/index.vue
new file mode 100644
index 0000000..05768ab
--- /dev/null
+++ b/src/views/ngtools/components/index.vue
@@ -0,0 +1,444 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+			<el-form-item label="	创建人名称	" prop="createName">
+				<el-input v-model="queryParams.createName" placeholder="请输入	创建人名称	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	更新人名称	" prop="updateName">
+				<el-input v-model="queryParams.updateName" placeholder="请输入	更新人名称	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	甲烷C1	" prop="ngC1">
+				<el-input v-model="queryParams.ngC1" placeholder="请输入	甲烷C1	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	氮气N2	" prop="ngN2">
+				<el-input v-model="queryParams.ngN2" placeholder="请输入	氮气N2	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	二氧化碳CO2	" prop="ngCo2">
+				<el-input v-model="queryParams.ngCo2" placeholder="请输入	二氧化碳CO2	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	乙烷C2	" prop="ngC2">
+				<el-input v-model="queryParams.ngC2" placeholder="请输入	乙烷C2	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	丙烷C3	" prop="ngC3">
+				<el-input v-model="queryParams.ngC3" placeholder="请输入	丙烷C3	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	水H2O	" prop="ngH2o">
+				<el-input v-model="queryParams.ngH2o" placeholder="请输入	水H2O	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	硫化氢H2S	" prop="ngH2s">
+				<el-input v-model="queryParams.ngH2s" placeholder="请输入	硫化氢H2S	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	氢气H2	" prop="ngH2">
+				<el-input v-model="queryParams.ngH2" placeholder="请输入	氢气H2	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	一氧化碳CO	" prop="ngCo">
+				<el-input v-model="queryParams.ngCo" placeholder="请输入	一氧化碳CO	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	氧气O2	" prop="ngO2">
+				<el-input v-model="queryParams.ngO2" placeholder="请输入	氧气O2	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	异丁烷iC4	" prop="ngIc4">
+				<el-input v-model="queryParams.ngIc4" placeholder="请输入	异丁烷iC4	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	正丁烷nC4	" prop="ngNc4">
+				<el-input v-model="queryParams.ngNc4" placeholder="请输入	正丁烷nC4	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	异戊烷iC5	" prop="ngIc5">
+				<el-input v-model="queryParams.ngIc5" placeholder="请输入	异戊烷iC5	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	正戊烷nC5	" prop="ngNc5">
+				<el-input v-model="queryParams.ngNc5" placeholder="请输入	正戊烷nC5	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	己烷C6	" prop="ngC6">
+				<el-input v-model="queryParams.ngC6" placeholder="请输入	己烷C6	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	庚烷C7	" prop="ngC7">
+				<el-input v-model="queryParams.ngC7" placeholder="请输入	庚烷C7	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	辛烷C8	" prop="ngC8">
+				<el-input v-model="queryParams.ngC8" placeholder="请输入	辛烷C8	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	壬烷C9	" prop="ngC9">
+				<el-input v-model="queryParams.ngC9" placeholder="请输入	壬烷C9	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	癸烷C10	" prop="ngC10">
+				<el-input v-model="queryParams.ngC10" placeholder="请输入	癸烷C10	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	氦气He	" prop="ngHe">
+				<el-input v-model="queryParams.ngHe" placeholder="请输入	氦气He	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="	氩气Ar	" prop="ngAr">
+				<el-input v-model="queryParams.ngAr" placeholder="请输入	氩气Ar	" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="合计" prop="sum">
+				<el-input v-model="queryParams.sum" placeholder="请输入合计" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="取样编号" prop="sampleno">
+				<el-input v-model="queryParams.sampleno" placeholder="请输入取样编号" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="仪表编号" prop="meterno">
+				<el-input v-model="queryParams.meterno" placeholder="请输入仪表编号" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="常用组分" prop="cyzf">
+				<el-select v-model="queryParams.cyzf" placeholder="请选择常用组分" clearable>
+					<el-option v-for="dict in ngtools_cyzf" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item>
+				<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+				<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['ngtools:components:add']">新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['ngtools:components:edit']">修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['ngtools:components:remove']">删除</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['ngtools:components:export']">导出</el-button>
+			</el-col>
+			<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="componentsList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="	ID	" align="center" prop="id" />
+			<el-table-column label="	创建人名称	" align="center" prop="createName" />
+			<el-table-column label="	更新人名称	" align="center" prop="updateName" />
+			<el-table-column label="	甲烷C1	" align="center" prop="ngC1" />
+			<el-table-column label="	氮气N2	" align="center" prop="ngN2" />
+			<el-table-column label="	二氧化碳CO2	" align="center" prop="ngCo2" />
+			<el-table-column label="	乙烷C2	" align="center" prop="ngC2" />
+			<el-table-column label="	丙烷C3	" align="center" prop="ngC3" />
+			<el-table-column label="	水H2O	" align="center" prop="ngH2o" />
+			<el-table-column label="	硫化氢H2S	" align="center" prop="ngH2s" />
+			<el-table-column label="	氢气H2	" align="center" prop="ngH2" />
+			<el-table-column label="	一氧化碳CO	" align="center" prop="ngCo" />
+			<el-table-column label="	氧气O2	" align="center" prop="ngO2" />
+			<el-table-column label="	异丁烷iC4	" align="center" prop="ngIc4" />
+			<el-table-column label="	正丁烷nC4	" align="center" prop="ngNc4" />
+			<el-table-column label="	异戊烷iC5	" align="center" prop="ngIc5" />
+			<el-table-column label="	正戊烷nC5	" align="center" prop="ngNc5" />
+			<el-table-column label="	己烷C6	" align="center" prop="ngC6" />
+			<el-table-column label="	庚烷C7	" align="center" prop="ngC7" />
+			<el-table-column label="	辛烷C8	" align="center" prop="ngC8" />
+			<el-table-column label="	壬烷C9	" align="center" prop="ngC9" />
+			<el-table-column label="	癸烷C10	" align="center" prop="ngC10" />
+			<el-table-column label="	氦气He	" align="center" prop="ngHe" />
+			<el-table-column label="	氩气Ar	" align="center" prop="ngAr" />
+			<el-table-column label="合计" align="center" prop="sum" />
+			<el-table-column label="取样编号" align="center" prop="sampleno" />
+			<el-table-column label="仪表编号" align="center" prop="meterno" />
+			<el-table-column label="常用组分" align="center" prop="cyzf">
+				<template #default="scope">
+					<dict-tag :options="ngtools_cyzf" :value="scope.row.cyzf" />
+				</template>
+			</el-table-column>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template #default="scope">
+					<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['ngtools:components:edit']">修改</el-button>
+					<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['ngtools:components:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+
+		<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改天然气组分对话框 -->
+		<el-dialog :title="title" v-model="open" width="500px" append-to-body>
+			<el-form ref="componentsRef" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="	创建人名称	" prop="createName">
+					<el-input v-model="form.createName" placeholder="请输入	创建人名称	" />
+				</el-form-item>
+				<el-form-item label="	更新人名称	" prop="updateName">
+					<el-input v-model="form.updateName" placeholder="请输入	更新人名称	" />
+				</el-form-item>
+				<el-form-item label="	甲烷C1	" prop="ngC1">
+					<el-input v-model="form.ngC1" placeholder="请输入	甲烷C1	" />
+				</el-form-item>
+				<el-form-item label="	氮气N2	" prop="ngN2">
+					<el-input v-model="form.ngN2" placeholder="请输入	氮气N2	" />
+				</el-form-item>
+				<el-form-item label="	二氧化碳CO2	" prop="ngCo2">
+					<el-input v-model="form.ngCo2" placeholder="请输入	二氧化碳CO2	" />
+				</el-form-item>
+				<el-form-item label="	乙烷C2	" prop="ngC2">
+					<el-input v-model="form.ngC2" placeholder="请输入	乙烷C2	" />
+				</el-form-item>
+				<el-form-item label="	丙烷C3	" prop="ngC3">
+					<el-input v-model="form.ngC3" placeholder="请输入	丙烷C3	" />
+				</el-form-item>
+				<el-form-item label="	水H2O	" prop="ngH2o">
+					<el-input v-model="form.ngH2o" placeholder="请输入	水H2O	" />
+				</el-form-item>
+				<el-form-item label="	硫化氢H2S	" prop="ngH2s">
+					<el-input v-model="form.ngH2s" placeholder="请输入	硫化氢H2S	" />
+				</el-form-item>
+				<el-form-item label="	氢气H2	" prop="ngH2">
+					<el-input v-model="form.ngH2" placeholder="请输入	氢气H2	" />
+				</el-form-item>
+				<el-form-item label="	一氧化碳CO	" prop="ngCo">
+					<el-input v-model="form.ngCo" placeholder="请输入	一氧化碳CO	" />
+				</el-form-item>
+				<el-form-item label="	氧气O2	" prop="ngO2">
+					<el-input v-model="form.ngO2" placeholder="请输入	氧气O2	" />
+				</el-form-item>
+				<el-form-item label="	异丁烷iC4	" prop="ngIc4">
+					<el-input v-model="form.ngIc4" placeholder="请输入	异丁烷iC4	" />
+				</el-form-item>
+				<el-form-item label="	正丁烷nC4	" prop="ngNc4">
+					<el-input v-model="form.ngNc4" placeholder="请输入	正丁烷nC4	" />
+				</el-form-item>
+				<el-form-item label="	异戊烷iC5	" prop="ngIc5">
+					<el-input v-model="form.ngIc5" placeholder="请输入	异戊烷iC5	" />
+				</el-form-item>
+				<el-form-item label="	正戊烷nC5	" prop="ngNc5">
+					<el-input v-model="form.ngNc5" placeholder="请输入	正戊烷nC5	" />
+				</el-form-item>
+				<el-form-item label="	己烷C6	" prop="ngC6">
+					<el-input v-model="form.ngC6" placeholder="请输入	己烷C6	" />
+				</el-form-item>
+				<el-form-item label="	庚烷C7	" prop="ngC7">
+					<el-input v-model="form.ngC7" placeholder="请输入	庚烷C7	" />
+				</el-form-item>
+				<el-form-item label="	辛烷C8	" prop="ngC8">
+					<el-input v-model="form.ngC8" placeholder="请输入	辛烷C8	" />
+				</el-form-item>
+				<el-form-item label="	壬烷C9	" prop="ngC9">
+					<el-input v-model="form.ngC9" placeholder="请输入	壬烷C9	" />
+				</el-form-item>
+				<el-form-item label="	癸烷C10	" prop="ngC10">
+					<el-input v-model="form.ngC10" placeholder="请输入	癸烷C10	" />
+				</el-form-item>
+				<el-form-item label="	氦气He	" prop="ngHe">
+					<el-input v-model="form.ngHe" placeholder="请输入	氦气He	" />
+				</el-form-item>
+				<el-form-item label="	氩气Ar	" prop="ngAr">
+					<el-input v-model="form.ngAr" placeholder="请输入	氩气Ar	" />
+				</el-form-item>
+				<el-form-item label="合计" prop="sum">
+					<el-input v-model="form.sum" placeholder="请输入合计" />
+				</el-form-item>
+				<el-form-item label="取样编号" prop="sampleno">
+					<el-input v-model="form.sampleno" placeholder="请输入取样编号" />
+				</el-form-item>
+				<el-form-item label="仪表编号" prop="meterno">
+					<el-input v-model="form.meterno" placeholder="请输入仪表编号" />
+				</el-form-item>
+				<el-form-item label="常用组分" prop="cyzf">
+					<el-select v-model="form.cyzf" placeholder="请选择常用组分">
+						<el-option v-for="dict in ngtools_cyzf" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button type="primary" @click="submitForm">确 定</el-button>
+					<el-button @click="cancel">取 消</el-button>
+				</div>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup name="Components">
+import { listComponents, getComponents, delComponents, addComponents, updateComponents } from '@/api/ngtools/components';
+
+const { proxy } = getCurrentInstance();
+const { ngtools_cyzf } = proxy.useDict('ngtools_cyzf');
+
+const componentsList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref('');
+
+const data = reactive({
+	form: {},
+	queryParams: {
+		pageNum: 1,
+		pageSize: 10,
+		createName: null,
+		updateName: null,
+		ngC1: null,
+		ngN2: null,
+		ngCo2: null,
+		ngC2: null,
+		ngC3: null,
+		ngH2o: null,
+		ngH2s: null,
+		ngH2: null,
+		ngCo: null,
+		ngO2: null,
+		ngIc4: null,
+		ngNc4: null,
+		ngIc5: null,
+		ngNc5: null,
+		ngC6: null,
+		ngC7: null,
+		ngC8: null,
+		ngC9: null,
+		ngC10: null,
+		ngHe: null,
+		ngAr: null,
+		sum: null,
+		sampleno: null,
+		meterno: null,
+		cyzf: null
+	},
+	rules: {}
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询天然气组分列表 */
+function getList() {
+	loading.value = true;
+	listComponents(queryParams.value).then((response) => {
+		componentsList.value = response.rows;
+		total.value = response.total;
+		loading.value = false;
+	});
+}
+
+// 取消按钮
+function cancel() {
+	open.value = false;
+	reset();
+}
+
+// 表单重置
+function reset() {
+	form.value = {
+		id: null,
+		createName: null,
+		createBy: null,
+		createTime: null,
+		updateName: null,
+		updateBy: null,
+		updateTime: null,
+		ngC1: null,
+		ngN2: null,
+		ngCo2: null,
+		ngC2: null,
+		ngC3: null,
+		ngH2o: null,
+		ngH2s: null,
+		ngH2: null,
+		ngCo: null,
+		ngO2: null,
+		ngIc4: null,
+		ngNc4: null,
+		ngIc5: null,
+		ngNc5: null,
+		ngC6: null,
+		ngC7: null,
+		ngC8: null,
+		ngC9: null,
+		ngC10: null,
+		ngHe: null,
+		ngAr: null,
+		sum: null,
+		sampleno: null,
+		meterno: null,
+		cyzf: null
+	};
+	proxy.resetForm('componentsRef');
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+	queryParams.value.pageNum = 1;
+	getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+	proxy.resetForm('queryRef');
+	handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+	ids.value = selection.map((item) => item.id);
+	single.value = selection.length != 1;
+	multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+	reset();
+	open.value = true;
+	title.value = '添加天然气组分';
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+	reset();
+	const _id = row.id || ids.value;
+	getComponents(_id).then((response) => {
+		form.value = response.data;
+		open.value = true;
+		title.value = '修改天然气组分';
+	});
+}
+
+/** 提交按钮 */
+function submitForm() {
+	proxy.$refs['componentsRef'].validate((valid) => {
+		if (valid) {
+			if (form.value.id != null) {
+				updateComponents(form.value).then((response) => {
+					proxy.$modal.msgSuccess('修改成功');
+					open.value = false;
+					getList();
+				});
+			} else {
+				addComponents(form.value).then((response) => {
+					proxy.$modal.msgSuccess('新增成功');
+					open.value = false;
+					getList();
+				});
+			}
+		}
+	});
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+	const _ids = row.id || ids.value;
+	proxy.$modal
+		.confirm('是否确认删除天然气组分编号为"' + _ids + '"的数据项？')
+		.then(function () {
+			return delComponents(_ids);
+		})
+		.then(() => {
+			getList();
+			proxy.$modal.msgSuccess('删除成功');
+		})
+		.catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+	proxy.download(
+		'ngtools/components/export',
+		{
+			...queryParams.value
+		},
+		`components_${new Date().getTime()}.xlsx`
+	);
+}
+
+getList();
+</script>
diff --git a/src/views/ngtools/meterpar/index.vue b/src/views/ngtools/meterpar/index.vue
new file mode 100644
index 0000000..f21d90f
--- /dev/null
+++ b/src/views/ngtools/meterpar/index.vue
@@ -0,0 +1,815 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+			<el-form-item label="创建人名称 " prop="createName">
+				<el-input v-model="queryParams.createName" placeholder="请输入创建人名称 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="处置人姓名 " prop="createBy">
+				<el-input v-model="queryParams.createBy" placeholder="请输入处置人姓名 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="创建处置时间 " prop="createTime">
+				<el-date-picker clearable v-model="queryParams.createTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择创建处置时间 "></el-date-picker>
+			</el-form-item>
+			<el-form-item label="更新人名称 " prop="updateName">
+				<el-input v-model="queryParams.updateName" placeholder="请输入更新人名称 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="更新人登录名称 " prop="updateBy">
+				<el-input v-model="queryParams.updateBy" placeholder="请输入更新人登录名称 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="更新日期 " prop="updateTime">
+				<el-date-picker clearable v-model="queryParams.updateTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择更新日期 "></el-date-picker>
+			</el-form-item>
+			<el-form-item label="流量计算标准 " prop="dFlowCalbz">
+				<el-select v-model="queryParams.dFlowCalbz" placeholder="请选择流量计算标准 " clearable>
+					<el-option v-for="dict in 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="queryParams.dZcalbz" placeholder="请选择压缩因子计算标准 " clearable>
+					<el-option v-for="dict in ngtools_ysyzjsbz" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="计量参比条件压力 " prop="dCbtj">
+				<el-select v-model="queryParams.dCbtj" placeholder="请选择计量参比条件压力 " clearable>
+					<el-option v-for="dict in ngtools_cbtj" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="计量参比条件压力 " prop="dpbM">
+				<el-input v-model="queryParams.dpbM" placeholder="请输入计量参比条件压力 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="计量参比条件温度 " prop="dtbM">
+				<el-input v-model="queryParams.dtbM" placeholder="请输入计量参比条件温度 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="燃烧参比条件压力 " prop="dpbE">
+				<el-input v-model="queryParams.dpbE" placeholder="请输入燃烧参比条件压力 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="燃烧参比条件温度 " prop="dtbE">
+				<el-input v-model="queryParams.dtbE" placeholder="请输入燃烧参比条件温度 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="当地大气压 " prop="dPatm">
+				<el-input v-model="queryParams.dPatm" placeholder="请输入当地大气压 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="当地大气压单位 " prop="dPatmUnit">
+				<el-input v-model="queryParams.dPatmUnit" placeholder="请输入当地大气压单位 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="天然气组分 " prop="dngCompents">
+				<el-input v-model="queryParams.dngCompents" placeholder="请输入天然气组分 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="流量计类别 " prop="dMeterType">
+				<el-select v-model="queryParams.dMeterType" placeholder="请选择流量计类别 " clearable>
+					<el-option v-for="dict in 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="queryParams.dCoreType" placeholder="请选择节流装置类型 " clearable>
+					<el-option v-for="dict in ngtools_jlzzlx" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="取压方式 " prop="dPtmode">
+				<el-select v-model="queryParams.dPtmode" placeholder="请选择取压方式 " clearable>
+					<el-option v-for="dict in qyfs" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="管道类型 " prop="dPipeType">
+				<el-select v-model="queryParams.dPipeType" placeholder="请选择管道类型 " clearable>
+					<el-option v-for="dict in ngtools_gdlx" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="管道内径 " prop="dPipeD">
+				<el-input v-model="queryParams.dPipeD" placeholder="请输入管道内径 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="长度单位 " prop="dLenUnit">
+				<el-input v-model="queryParams.dLenUnit" placeholder="请输入长度单位 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="管道内径参考温度 " prop="dPipeDtemp">
+				<el-input v-model="queryParams.dPipeDtemp" placeholder="请输入管道内径参考温度 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="温度单位 " prop="dPileDtempU">
+				<el-input v-model="queryParams.dPileDtempU" placeholder="请输入温度单位 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="管道材料 " prop="dPipeMaterial">
+				<el-select v-model="queryParams.dPipeMaterial" placeholder="请选择管道材料 " clearable>
+					<el-option v-for="dict in ngtools_gdcz" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="孔板孔径 " prop="dOrificeD">
+				<el-input v-model="queryParams.dOrificeD" placeholder="请输入孔板孔径 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="长度单位 " prop="dOrificeUnit">
+				<el-input v-model="queryParams.dOrificeUnit" placeholder="请输入长度单位 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="孔板内径参考温度 " prop="dOrificeDtemp">
+				<el-input v-model="queryParams.dOrificeDtemp" placeholder="请输入孔板内径参考温度 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="温度单位 " prop="dOrificeDtempUnit">
+				<el-input v-model="queryParams.dOrificeDtempUnit" placeholder="请输入温度单位 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="孔板材料 " prop="dOrificeMaterial">
+				<el-select v-model="queryParams.dOrificeMaterial" placeholder="请选择孔板材料 " clearable>
+					<el-option v-for="dict in ngtools_gdcz" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="锐利度系数计算方法 " prop="dOrificeSharpness">
+				<el-input v-model="queryParams.dOrificeSharpness" placeholder="请输入锐利度系数计算方法 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="孔板入口圆弧半径 " prop="dOrificeRk">
+				<el-input v-model="queryParams.dOrificeRk" placeholder="请输入孔板入口圆弧半径 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="长度单位 " prop="dOrificeRkLenU">
+				<el-input v-model="queryParams.dOrificeRkLenU" placeholder="请输入长度单位 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="输入压力 " prop="dPf">
+				<el-input v-model="queryParams.dPf" placeholder="请输入输入压力 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="压力单位 " prop="dPfUnit">
+				<el-input v-model="queryParams.dPfUnit" placeholder="请输入压力单位 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="压力类型 " prop="dPfType">
+				<el-select v-model="queryParams.dPfType" placeholder="请选择压力类型 " clearable>
+					<el-option v-for="dict in ngtools_yllx" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="输入温度 " prop="dTf">
+				<el-input v-model="queryParams.dTf" placeholder="请输入输入温度 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="温度单位 " prop="dTfUnit">
+				<el-input v-model="queryParams.dTfUnit" placeholder="请输入温度单位 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="输入差压 " prop="dDp">
+				<el-input v-model="queryParams.dDp" placeholder="请输入输入差压 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="压力单位 " prop="dDpUnit">
+				<el-input v-model="queryParams.dDpUnit" placeholder="请输入压力单位 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="体积流量单位 " prop="dVFlowUnit">
+				<el-input v-model="queryParams.dVFlowUnit" placeholder="请输入体积流量单位 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="质量流量单位 " prop="dMFlowUnit">
+				<el-input v-model="queryParams.dMFlowUnit" placeholder="请输入质量流量单位 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="能量流量单位 " prop="dEFlowUnit">
+				<el-input v-model="queryParams.dEFlowUnit" placeholder="请输入能量流量单位 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="流出系数 " prop="dCd">
+				<el-input v-model="queryParams.dCd" placeholder="请输入流出系数 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="流出系数计算方法 " prop="dCdCalMethod">
+				<el-select v-model="queryParams.dCdCalMethod" placeholder="请选择流出系数计算方法 " clearable>
+					<el-option v-for="dict in ngtools_lcxsjsff" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="仪表系数 " prop="dMeterFactor">
+				<el-input v-model="queryParams.dMeterFactor" placeholder="请输入仪表系数 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="脉冲数 " prop="dPulseNum">
+				<el-input v-model="queryParams.dPulseNum" placeholder="请输入脉冲数 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="最大体积流量 " prop="dVFlowMax">
+				<el-input v-model="queryParams.dVFlowMax" placeholder="请输入最大体积流量 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="最小体积流量 " prop="dVFlowMin">
+				<el-input v-model="queryParams.dVFlowMin" placeholder="请输入最小体积流量 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="常用流量 " prop="dVFlowCon">
+				<el-input v-model="queryParams.dVFlowCon" placeholder="请输入常用流量 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="压力量程下限 " prop="dPfRangeMin">
+				<el-input v-model="queryParams.dPfRangeMin" placeholder="请输入压力量程下限 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="压力量程上限 " prop="dPfRangeMax">
+				<el-input v-model="queryParams.dPfRangeMax" placeholder="请输入压力量程上限 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="差压量程下限 " prop="dDpRangeMin">
+				<el-input v-model="queryParams.dDpRangeMin" placeholder="请输入差压量程下限 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="差压量程上限 " prop="dDpRangeMax">
+				<el-input v-model="queryParams.dDpRangeMax" placeholder="请输入差压量程上限 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="温度计量程下限 " prop="dTfRangeMin">
+				<el-input v-model="queryParams.dTfRangeMin" placeholder="请输入温度计量程下限 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="温度计量程上限 " prop="dTfRangeMax">
+				<el-input v-model="queryParams.dTfRangeMax" placeholder="请输入温度计量程上限 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="管束车容积 " prop="dVGsc">
+				<el-input v-model="queryParams.dVGsc" placeholder="请输入管束车容积 " clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="取样编号" prop="sampleno">
+				<el-input v-model="queryParams.sampleno" placeholder="请输入取样编号" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="仪表编号" prop="meterno">
+				<el-input v-model="queryParams.meterno" placeholder="请输入仪表编号" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item>
+				<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+				<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['ngtools:meterpar:add']">新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['ngtools:meterpar:edit']">修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['ngtools:meterpar:remove']">删除</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['ngtools:meterpar:export']">导出</el-button>
+			</el-col>
+			<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="meterparList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="ID " align="center" prop="id" />
+			<el-table-column label="创建人名称 " align="center" prop="createName" />
+			<el-table-column label="处置人姓名 " align="center" prop="createBy" />
+			<el-table-column label="创建处置时间 " align="center" prop="createTime" width="180">
+				<template #default="scope">
+					<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="更新人名称 " align="center" prop="updateName" />
+			<el-table-column label="更新人登录名称 " align="center" prop="updateBy" />
+			<el-table-column label="更新日期 " align="center" prop="updateTime" width="180">
+				<template #default="scope">
+					<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="流量计算标准 " align="center" prop="dFlowCalbz">
+				<template #default="scope">
+					<dict-tag :options="ngtools_lljsbz" :value="scope.row.dFlowCalbz" />
+				</template>
+			</el-table-column>
+			<el-table-column label="压缩因子计算标准 " align="center" prop="dZcalbz">
+				<template #default="scope">
+					<dict-tag :options="ngtools_ysyzjsbz" :value="scope.row.dZcalbz" />
+				</template>
+			</el-table-column>
+			<el-table-column label="计量参比条件压力 " align="center" prop="dCbtj">
+				<template #default="scope">
+					<dict-tag :options="ngtools_cbtj" :value="scope.row.dCbtj" />
+				</template>
+			</el-table-column>
+			<el-table-column label="计量参比条件压力 " align="center" prop="dpbM" />
+			<el-table-column label="计量参比条件温度 " align="center" prop="dtbM" />
+			<el-table-column label="燃烧参比条件压力 " align="center" prop="dpbE" />
+			<el-table-column label="燃烧参比条件温度 " align="center" prop="dtbE" />
+			<el-table-column label="当地大气压 " align="center" prop="dPatm" />
+			<el-table-column label="当地大气压单位 " align="center" prop="dPatmUnit" />
+			<el-table-column label="天然气组分 " align="center" prop="dngCompents" />
+			<el-table-column label="流量计类别 " align="center" prop="dMeterType">
+				<template #default="scope">
+					<dict-tag :options="ngtools_lljlx" :value="scope.row.dMeterType" />
+				</template>
+			</el-table-column>
+			<el-table-column label="节流装置类型 " align="center" prop="dCoreType">
+				<template #default="scope">
+					<dict-tag :options="ngtools_jlzzlx" :value="scope.row.dCoreType" />
+				</template>
+			</el-table-column>
+			<el-table-column label="取压方式 " align="center" prop="dPtmode">
+				<template #default="scope">
+					<dict-tag :options="qyfs" :value="scope.row.dPtmode" />
+				</template>
+			</el-table-column>
+			<el-table-column label="管道类型 " align="center" prop="dPipeType">
+				<template #default="scope">
+					<dict-tag :options="ngtools_gdlx" :value="scope.row.dPipeType" />
+				</template>
+			</el-table-column>
+			<el-table-column label="管道内径 " align="center" prop="dPipeD" />
+			<el-table-column label="长度单位 " align="center" prop="dLenUnit" />
+			<el-table-column label="管道内径参考温度 " align="center" prop="dPipeDtemp" />
+			<el-table-column label="温度单位 " align="center" prop="dPileDtempU" />
+			<el-table-column label="管道材料 " align="center" prop="dPipeMaterial">
+				<template #default="scope">
+					<dict-tag :options="ngtools_gdcz" :value="scope.row.dPipeMaterial" />
+				</template>
+			</el-table-column>
+			<el-table-column label="孔板孔径 " align="center" prop="dOrificeD" />
+			<el-table-column label="长度单位 " align="center" prop="dOrificeUnit" />
+			<el-table-column label="孔板内径参考温度 " align="center" prop="dOrificeDtemp" />
+			<el-table-column label="温度单位 " align="center" prop="dOrificeDtempUnit" />
+			<el-table-column label="孔板材料 " align="center" prop="dOrificeMaterial">
+				<template #default="scope">
+					<dict-tag :options="ngtools_gdcz" :value="scope.row.dOrificeMaterial" />
+				</template>
+			</el-table-column>
+			<el-table-column label="锐利度系数计算方法 " align="center" prop="dOrificeSharpness" />
+			<el-table-column label="孔板入口圆弧半径 " align="center" prop="dOrificeRk" />
+			<el-table-column label="长度单位 " align="center" prop="dOrificeRkLenU" />
+			<el-table-column label="输入压力 " align="center" prop="dPf" />
+			<el-table-column label="压力单位 " align="center" prop="dPfUnit" />
+			<el-table-column label="压力类型 " align="center" prop="dPfType">
+				<template #default="scope">
+					<dict-tag :options="ngtools_yllx" :value="scope.row.dPfType" />
+				</template>
+			</el-table-column>
+			<el-table-column label="输入温度 " align="center" prop="dTf" />
+			<el-table-column label="温度单位 " align="center" prop="dTfUnit" />
+			<el-table-column label="输入差压 " align="center" prop="dDp" />
+			<el-table-column label="压力单位 " align="center" prop="dDpUnit" />
+			<el-table-column label="体积流量单位 " align="center" prop="dVFlowUnit" />
+			<el-table-column label="质量流量单位 " align="center" prop="dMFlowUnit" />
+			<el-table-column label="能量流量单位 " align="center" prop="dEFlowUnit" />
+			<el-table-column label="流出系数 " align="center" prop="dCd" />
+			<el-table-column label="流出系数计算方法 " align="center" prop="dCdCalMethod">
+				<template #default="scope">
+					<dict-tag :options="ngtools_lcxsjsff" :value="scope.row.dCdCalMethod" />
+				</template>
+			</el-table-column>
+			<el-table-column label="仪表系数 " align="center" prop="dMeterFactor" />
+			<el-table-column label="脉冲数 " align="center" prop="dPulseNum" />
+			<el-table-column label="最大体积流量 " align="center" prop="dVFlowMax" />
+			<el-table-column label="最小体积流量 " align="center" prop="dVFlowMin" />
+			<el-table-column label="常用流量 " align="center" prop="dVFlowCon" />
+			<el-table-column label="压力量程下限 " align="center" prop="dPfRangeMin" />
+			<el-table-column label="压力量程上限 " align="center" prop="dPfRangeMax" />
+			<el-table-column label="差压量程下限 " align="center" prop="dDpRangeMin" />
+			<el-table-column label="差压量程上限 " align="center" prop="dDpRangeMax" />
+			<el-table-column label="温度计量程下限 " align="center" prop="dTfRangeMin" />
+			<el-table-column label="温度计量程上限 " align="center" prop="dTfRangeMax" />
+			<el-table-column label="管束车容积 " align="center" prop="dVGsc" />
+			<el-table-column label="取样编号" align="center" prop="sampleno" />
+			<el-table-column label="仪表编号" align="center" prop="meterno" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template #default="scope">
+					<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['ngtools:meterpar:edit']">修改</el-button>
+					<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['ngtools:meterpar:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+
+		<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改流量计参数对话框 -->
+		<el-dialog :title="title" v-model="open" width="500px" append-to-body>
+			<el-form ref="meterparRef" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="创建人名称 " prop="createName">
+					<el-input v-model="form.createName" placeholder="请输入创建人名称 " />
+				</el-form-item>
+				<el-form-item label="更新人名称 " prop="updateName">
+					<el-input v-model="form.updateName" placeholder="请输入更新人名称 " />
+				</el-form-item>
+				<el-form-item label="流量计算标准 " prop="dFlowCalbz">
+					<el-select v-model="form.dFlowCalbz" placeholder="请选择流量计算标准 ">
+						<el-option v-for="dict in ngtools_lljsbz" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="压缩因子计算标准 " prop="dZcalbz">
+					<el-select v-model="form.dZcalbz" placeholder="请选择压缩因子计算标准 ">
+						<el-option v-for="dict in ngtools_ysyzjsbz" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="计量参比条件压力 " prop="dCbtj">
+					<el-select v-model="form.dCbtj" placeholder="请选择计量参比条件压力 ">
+						<el-option v-for="dict in ngtools_cbtj" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="计量参比条件压力 " prop="dpbM">
+					<el-input v-model="form.dpbM" placeholder="请输入计量参比条件压力 " />
+				</el-form-item>
+				<el-form-item label="计量参比条件温度 " prop="dtbM">
+					<el-input v-model="form.dtbM" placeholder="请输入计量参比条件温度 " />
+				</el-form-item>
+				<el-form-item label="燃烧参比条件压力 " prop="dpbE">
+					<el-input v-model="form.dpbE" placeholder="请输入燃烧参比条件压力 " />
+				</el-form-item>
+				<el-form-item label="燃烧参比条件温度 " prop="dtbE">
+					<el-input v-model="form.dtbE" placeholder="请输入燃烧参比条件温度 " />
+				</el-form-item>
+				<el-form-item label="当地大气压 " prop="dPatm">
+					<el-input v-model="form.dPatm" placeholder="请输入当地大气压 " />
+				</el-form-item>
+				<el-form-item label="当地大气压单位 " prop="dPatmUnit">
+					<el-input v-model="form.dPatmUnit" placeholder="请输入当地大气压单位 " />
+				</el-form-item>
+				<el-form-item label="天然气组分 " prop="dngCompents">
+					<el-input v-model="form.dngCompents" placeholder="请输入天然气组分 " />
+				</el-form-item>
+				<el-form-item label="流量计类别 " prop="dMeterType">
+					<el-select v-model="form.dMeterType" placeholder="请选择流量计类别 ">
+						<el-option v-for="dict in ngtools_lljlx" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="节流装置类型 " prop="dCoreType">
+					<el-select v-model="form.dCoreType" placeholder="请选择节流装置类型 ">
+						<el-option v-for="dict in ngtools_jlzzlx" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="取压方式 " prop="dPtmode">
+					<el-select v-model="form.dPtmode" placeholder="请选择取压方式 ">
+						<el-option v-for="dict in qyfs" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="管道类型 " prop="dPipeType">
+					<el-select v-model="form.dPipeType" placeholder="请选择管道类型 ">
+						<el-option v-for="dict in ngtools_gdlx" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="管道内径 " prop="dPipeD">
+					<el-input v-model="form.dPipeD" placeholder="请输入管道内径 " />
+				</el-form-item>
+				<el-form-item label="长度单位 " prop="dLenUnit">
+					<el-input v-model="form.dLenUnit" placeholder="请输入长度单位 " />
+				</el-form-item>
+				<el-form-item label="管道内径参考温度 " prop="dPipeDtemp">
+					<el-input v-model="form.dPipeDtemp" placeholder="请输入管道内径参考温度 " />
+				</el-form-item>
+				<el-form-item label="温度单位 " prop="dPileDtempU">
+					<el-input v-model="form.dPileDtempU" placeholder="请输入温度单位 " />
+				</el-form-item>
+				<el-form-item label="管道材料 " prop="dPipeMaterial">
+					<el-select v-model="form.dPipeMaterial" placeholder="请选择管道材料 ">
+						<el-option v-for="dict in ngtools_gdcz" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="孔板孔径 " prop="dOrificeD">
+					<el-input v-model="form.dOrificeD" placeholder="请输入孔板孔径 " />
+				</el-form-item>
+				<el-form-item label="长度单位 " prop="dOrificeUnit">
+					<el-input v-model="form.dOrificeUnit" placeholder="请输入长度单位 " />
+				</el-form-item>
+				<el-form-item label="孔板内径参考温度 " prop="dOrificeDtemp">
+					<el-input v-model="form.dOrificeDtemp" placeholder="请输入孔板内径参考温度 " />
+				</el-form-item>
+				<el-form-item label="温度单位 " prop="dOrificeDtempUnit">
+					<el-input v-model="form.dOrificeDtempUnit" placeholder="请输入温度单位 " />
+				</el-form-item>
+				<el-form-item label="孔板材料 " prop="dOrificeMaterial">
+					<el-select v-model="form.dOrificeMaterial" placeholder="请选择孔板材料 ">
+						<el-option v-for="dict in ngtools_gdcz" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="锐利度系数计算方法 " prop="dOrificeSharpness">
+					<el-input v-model="form.dOrificeSharpness" placeholder="请输入锐利度系数计算方法 " />
+				</el-form-item>
+				<el-form-item label="孔板入口圆弧半径 " prop="dOrificeRk">
+					<el-input v-model="form.dOrificeRk" placeholder="请输入孔板入口圆弧半径 " />
+				</el-form-item>
+				<el-form-item label="长度单位 " prop="dOrificeRkLenU">
+					<el-input v-model="form.dOrificeRkLenU" placeholder="请输入长度单位 " />
+				</el-form-item>
+				<el-form-item label="输入压力 " prop="dPf">
+					<el-input v-model="form.dPf" placeholder="请输入输入压力 " />
+				</el-form-item>
+				<el-form-item label="压力单位 " prop="dPfUnit">
+					<el-input v-model="form.dPfUnit" placeholder="请输入压力单位 " />
+				</el-form-item>
+				<el-form-item label="压力类型 " prop="dPfType">
+					<el-select v-model="form.dPfType" placeholder="请选择压力类型 ">
+						<el-option v-for="dict in ngtools_yllx" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="输入温度 " prop="dTf">
+					<el-input v-model="form.dTf" placeholder="请输入输入温度 " />
+				</el-form-item>
+				<el-form-item label="温度单位 " prop="dTfUnit">
+					<el-input v-model="form.dTfUnit" placeholder="请输入温度单位 " />
+				</el-form-item>
+				<el-form-item label="输入差压 " prop="dDp">
+					<el-input v-model="form.dDp" placeholder="请输入输入差压 " />
+				</el-form-item>
+				<el-form-item label="压力单位 " prop="dDpUnit">
+					<el-input v-model="form.dDpUnit" placeholder="请输入压力单位 " />
+				</el-form-item>
+				<el-form-item label="体积流量单位 " prop="dVFlowUnit">
+					<el-input v-model="form.dVFlowUnit" placeholder="请输入体积流量单位 " />
+				</el-form-item>
+				<el-form-item label="质量流量单位 " prop="dMFlowUnit">
+					<el-input v-model="form.dMFlowUnit" placeholder="请输入质量流量单位 " />
+				</el-form-item>
+				<el-form-item label="能量流量单位 " prop="dEFlowUnit">
+					<el-input v-model="form.dEFlowUnit" placeholder="请输入能量流量单位 " />
+				</el-form-item>
+				<el-form-item label="流出系数 " prop="dCd">
+					<el-input v-model="form.dCd" placeholder="请输入流出系数 " />
+				</el-form-item>
+				<el-form-item label="流出系数计算方法 " prop="dCdCalMethod">
+					<el-select v-model="form.dCdCalMethod" placeholder="请选择流出系数计算方法 ">
+						<el-option v-for="dict in ngtools_lcxsjsff" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="仪表系数 " prop="dMeterFactor">
+					<el-input v-model="form.dMeterFactor" placeholder="请输入仪表系数 " />
+				</el-form-item>
+				<el-form-item label="脉冲数 " prop="dPulseNum">
+					<el-input v-model="form.dPulseNum" placeholder="请输入脉冲数 " />
+				</el-form-item>
+				<el-form-item label="最大体积流量 " prop="dVFlowMax">
+					<el-input v-model="form.dVFlowMax" placeholder="请输入最大体积流量 " />
+				</el-form-item>
+				<el-form-item label="最小体积流量 " prop="dVFlowMin">
+					<el-input v-model="form.dVFlowMin" placeholder="请输入最小体积流量 " />
+				</el-form-item>
+				<el-form-item label="常用流量 " prop="dVFlowCon">
+					<el-input v-model="form.dVFlowCon" placeholder="请输入常用流量 " />
+				</el-form-item>
+				<el-form-item label="压力量程下限 " prop="dPfRangeMin">
+					<el-input v-model="form.dPfRangeMin" placeholder="请输入压力量程下限 " />
+				</el-form-item>
+				<el-form-item label="压力量程上限 " prop="dPfRangeMax">
+					<el-input v-model="form.dPfRangeMax" placeholder="请输入压力量程上限 " />
+				</el-form-item>
+				<el-form-item label="差压量程下限 " prop="dDpRangeMin">
+					<el-input v-model="form.dDpRangeMin" placeholder="请输入差压量程下限 " />
+				</el-form-item>
+				<el-form-item label="差压量程上限 " prop="dDpRangeMax">
+					<el-input v-model="form.dDpRangeMax" placeholder="请输入差压量程上限 " />
+				</el-form-item>
+				<el-form-item label="温度计量程下限 " prop="dTfRangeMin">
+					<el-input v-model="form.dTfRangeMin" placeholder="请输入温度计量程下限 " />
+				</el-form-item>
+				<el-form-item label="温度计量程上限 " prop="dTfRangeMax">
+					<el-input v-model="form.dTfRangeMax" placeholder="请输入温度计量程上限 " />
+				</el-form-item>
+				<el-form-item label="管束车容积 " prop="dVGsc">
+					<el-input v-model="form.dVGsc" placeholder="请输入管束车容积 " />
+				</el-form-item>
+				<el-form-item label="取样编号" prop="sampleno">
+					<el-input v-model="form.sampleno" placeholder="请输入取样编号" />
+				</el-form-item>
+				<el-form-item label="仪表编号" prop="meterno">
+					<el-input v-model="form.meterno" placeholder="请输入仪表编号" />
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button type="primary" @click="submitForm">确 定</el-button>
+					<el-button @click="cancel">取 消</el-button>
+				</div>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup name="Meterpar">
+import { listMeterpar, getMeterpar, delMeterpar, addMeterpar, updateMeterpar } from '@/api/ngtools/meterpar';
+
+const { proxy } = getCurrentInstance();
+const { ngtools_cbtj, ngtools_jlzzlx, ngtools_lljlx, qyfs, ngtools_gdcz, ngtools_lcxsjsff, ngtools_gdlx, ngtools_yllx, ngtools_lljsbz, ngtools_ysyzjsbz } = proxy.useDict(
+	'ngtools_cbtj',
+	'ngtools_jlzzlx',
+	'ngtools_lljlx',
+	'qyfs',
+	'ngtools_gdcz',
+	'ngtools_lcxsjsff',
+	'ngtools_gdlx',
+	'ngtools_yllx',
+	'ngtools_lljsbz',
+	'ngtools_ysyzjsbz'
+);
+
+const meterparList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref('');
+
+const data = reactive({
+	form: {},
+	queryParams: {
+		pageNum: 1,
+		pageSize: 10,
+		createName: null,
+		createBy: null,
+		createTime: null,
+		updateName: null,
+		updateBy: null,
+		updateTime: null,
+		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: null,
+		dMFlowUnit: null,
+		dEFlowUnit: null,
+		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,
+		sampleno: null,
+		meterno: null
+	},
+	rules: {}
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询流量计参数列表 */
+function getList() {
+	loading.value = true;
+	listMeterpar(queryParams.value).then((response) => {
+		meterparList.value = response.rows;
+		total.value = response.total;
+		loading.value = false;
+	});
+}
+
+// 取消按钮
+function cancel() {
+	open.value = false;
+	reset();
+}
+
+// 表单重置
+function reset() {
+	form.value = {
+		id: null,
+		createName: null,
+		createBy: null,
+		createTime: null,
+		updateName: null,
+		updateBy: null,
+		updateTime: null,
+		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: null,
+		dMFlowUnit: null,
+		dEFlowUnit: null,
+		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,
+		sampleno: null,
+		meterno: null
+	};
+	proxy.resetForm('meterparRef');
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+	queryParams.value.pageNum = 1;
+	getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+	proxy.resetForm('queryRef');
+	handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+	ids.value = selection.map((item) => item.id);
+	single.value = selection.length != 1;
+	multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+	reset();
+	open.value = true;
+	title.value = '添加流量计参数';
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+	reset();
+	const _id = row.id || ids.value;
+	getMeterpar(_id).then((response) => {
+		form.value = response.data;
+		open.value = true;
+		title.value = '修改流量计参数';
+	});
+}
+
+/** 提交按钮 */
+function submitForm() {
+	proxy.$refs['meterparRef'].validate((valid) => {
+		if (valid) {
+			if (form.value.id != null) {
+				updateMeterpar(form.value).then((response) => {
+					proxy.$modal.msgSuccess('修改成功');
+					open.value = false;
+					getList();
+				});
+			} else {
+				addMeterpar(form.value).then((response) => {
+					proxy.$modal.msgSuccess('新增成功');
+					open.value = false;
+					getList();
+				});
+			}
+		}
+	});
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+	const _ids = row.id || ids.value;
+	proxy.$modal
+		.confirm('是否确认删除流量计参数编号为"' + _ids + '"的数据项？')
+		.then(function () {
+			return delMeterpar(_ids);
+		})
+		.then(() => {
+			getList();
+			proxy.$modal.msgSuccess('删除成功');
+		})
+		.catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+	proxy.download(
+		'ngtools/meterpar/export',
+		{
+			...queryParams.value
+		},
+		`meterpar_${new Date().getTime()}.xlsx`
+	);
+}
+
+getList();
+</script>
diff --git a/src/views/ngtools/meterresult/index.vue b/src/views/ngtools/meterresult/index.vue
new file mode 100644
index 0000000..a72f245
--- /dev/null
+++ b/src/views/ngtools/meterresult/index.vue
@@ -0,0 +1,399 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+			<el-form-item label="创建人名称" prop="createName">
+				<el-input v-model="queryParams.createName" placeholder="请输入创建人名称" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="更新人名称" prop="updateName">
+				<el-input v-model="queryParams.updateName" placeholder="请输入更新人名称" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="流量计编号" prop="ybbh">
+				<el-input v-model="queryParams.ybbh" placeholder="请输入流量计编号" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="求渐近速度系数 E" prop="dE">
+				<el-input v-model="queryParams.dE" placeholder="请输入求渐近速度系数 E" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="求相对密度系数 FG" prop="dFG">
+				<el-input v-model="queryParams.dFG" placeholder="请输入求相对密度系数 FG" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="求流动温度系数 FT" prop="dFT">
+				<el-input v-model="queryParams.dFT" placeholder="请输入求流动温度系数 FT" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="求动力粘度dlnd" prop="dDViscosity">
+				<el-input v-model="queryParams.dDViscosity" placeholder="请输入求动力粘度dlnd" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="求可膨胀系数" prop="dDExpCoefficient">
+				<el-input v-model="queryParams.dDExpCoefficient" placeholder="请输入求可膨胀系数" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="管道雷诺数" prop="dRnPipe">
+				<el-input v-model="queryParams.dRnPipe" placeholder="请输入管道雷诺数" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="孔板锐利度系数Bk" prop="dBk">
+				<el-input v-model="queryParams.dBk" placeholder="请输入孔板锐利度系数Bk" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="管道粗糙度系数 Gme" prop="dRoughNessPipe">
+				<el-input v-model="queryParams.dRoughNessPipe" placeholder="请输入管道粗糙度系数 Gme" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="修正后的流出系数" prop="dCdCorrect">
+				<el-input v-model="queryParams.dCdCorrect" placeholder="请输入修正后的流出系数" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="喷嘴的流出系数" prop="dCdNozell">
+				<el-input v-model="queryParams.dCdNozell" placeholder="请输入喷嘴的流出系数" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="标况体积流量m³/s" prop="dVFlowb">
+				<el-input v-model="queryParams.dVFlowb" placeholder="请输入标况体积流量m³/s" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="工况体积流量" prop="dVFlowf">
+				<el-input v-model="queryParams.dVFlowf" placeholder="请输入工况体积流量" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="标况质量流量" prop="dMFlowb">
+				<el-input v-model="queryParams.dMFlowb" placeholder="请输入标况质量流量" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="标况能量流量" prop="dEFlowb">
+				<el-input v-model="queryParams.dEFlowb" placeholder="请输入标况能量流量" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="管道内天然气流速" prop="dVelocityFlow">
+				<el-input v-model="queryParams.dVelocityFlow" placeholder="请输入管道内天然气流速" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="压力损失" prop="dPressLost">
+				<el-input v-model="queryParams.dPressLost" placeholder="请输入压力损失" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="直径比" prop="dBeta">
+				<el-input v-model="queryParams.dBeta" placeholder="请输入直径比" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="等熵指数" prop="dKappa">
+				<el-input v-model="queryParams.dKappa" placeholder="请输入等熵指数" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="取样编号" prop="sampleno">
+				<el-input v-model="queryParams.sampleno" placeholder="请输入取样编号" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="仪表编号" prop="meterno">
+				<el-input v-model="queryParams.meterno" placeholder="请输入仪表编号" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item>
+				<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+				<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['ngtools:meterresult:add']">新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['ngtools:meterresult:edit']">修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['ngtools:meterresult:remove']">删除</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['ngtools:meterresult:export']">导出</el-button>
+			</el-col>
+			<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="meterresultList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="ID" align="center" prop="id" />
+			<el-table-column label="创建人名称" align="center" prop="createName" />
+			<el-table-column label="更新人名称" align="center" prop="updateName" />
+			<el-table-column label="流量计编号" align="center" prop="ybbh" />
+			<el-table-column label="求渐近速度系数 E" align="center" prop="dE" />
+			<el-table-column label="求相对密度系数 FG" align="center" prop="dFG" />
+			<el-table-column label="求流动温度系数 FT" align="center" prop="dFT" />
+			<el-table-column label="求动力粘度dlnd" align="center" prop="dDViscosity" />
+			<el-table-column label="求可膨胀系数" align="center" prop="dDExpCoefficient" />
+			<el-table-column label="管道雷诺数" align="center" prop="dRnPipe" />
+			<el-table-column label="孔板锐利度系数Bk" align="center" prop="dBk" />
+			<el-table-column label="管道粗糙度系数 Gme" align="center" prop="dRoughNessPipe" />
+			<el-table-column label="修正后的流出系数" align="center" prop="dCdCorrect" />
+			<el-table-column label="喷嘴的流出系数" align="center" prop="dCdNozell" />
+			<el-table-column label="标况体积流量m³/s" align="center" prop="dVFlowb" />
+			<el-table-column label="工况体积流量" align="center" prop="dVFlowf" />
+			<el-table-column label="标况质量流量" align="center" prop="dMFlowb" />
+			<el-table-column label="标况能量流量" align="center" prop="dEFlowb" />
+			<el-table-column label="管道内天然气流速" align="center" prop="dVelocityFlow" />
+			<el-table-column label="压力损失" align="center" prop="dPressLost" />
+			<el-table-column label="直径比" align="center" prop="dBeta" />
+			<el-table-column label="等熵指数" align="center" prop="dKappa" />
+			<el-table-column label="取样编号" align="center" prop="sampleno" />
+			<el-table-column label="仪表编号" align="center" prop="meterno" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template #default="scope">
+					<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['ngtools:meterresult:edit']">修改</el-button>
+					<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['ngtools:meterresult:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+
+		<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改流量计算结果对话框 -->
+		<el-dialog :title="title" v-model="open" width="500px" append-to-body>
+			<el-form ref="meterresultRef" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="创建人名称" prop="createName">
+					<el-input v-model="form.createName" placeholder="请输入创建人名称" />
+				</el-form-item>
+				<el-form-item label="更新人名称" prop="updateName">
+					<el-input v-model="form.updateName" placeholder="请输入更新人名称" />
+				</el-form-item>
+				<el-form-item label="流量计编号" prop="ybbh">
+					<el-input v-model="form.ybbh" placeholder="请输入流量计编号" />
+				</el-form-item>
+				<el-form-item label="求渐近速度系数 E" prop="dE">
+					<el-input v-model="form.dE" placeholder="请输入求渐近速度系数 E" />
+				</el-form-item>
+				<el-form-item label="求相对密度系数 FG" prop="dFG">
+					<el-input v-model="form.dFG" placeholder="请输入求相对密度系数 FG" />
+				</el-form-item>
+				<el-form-item label="求流动温度系数 FT" prop="dFT">
+					<el-input v-model="form.dFT" placeholder="请输入求流动温度系数 FT" />
+				</el-form-item>
+				<el-form-item label="求动力粘度dlnd" prop="dDViscosity">
+					<el-input v-model="form.dDViscosity" placeholder="请输入求动力粘度dlnd" />
+				</el-form-item>
+				<el-form-item label="求可膨胀系数" prop="dDExpCoefficient">
+					<el-input v-model="form.dDExpCoefficient" placeholder="请输入求可膨胀系数" />
+				</el-form-item>
+				<el-form-item label="管道雷诺数" prop="dRnPipe">
+					<el-input v-model="form.dRnPipe" placeholder="请输入管道雷诺数" />
+				</el-form-item>
+				<el-form-item label="孔板锐利度系数Bk" prop="dBk">
+					<el-input v-model="form.dBk" placeholder="请输入孔板锐利度系数Bk" />
+				</el-form-item>
+				<el-form-item label="管道粗糙度系数 Gme" prop="dRoughNessPipe">
+					<el-input v-model="form.dRoughNessPipe" placeholder="请输入管道粗糙度系数 Gme" />
+				</el-form-item>
+				<el-form-item label="修正后的流出系数" prop="dCdCorrect">
+					<el-input v-model="form.dCdCorrect" placeholder="请输入修正后的流出系数" />
+				</el-form-item>
+				<el-form-item label="喷嘴的流出系数" prop="dCdNozell">
+					<el-input v-model="form.dCdNozell" placeholder="请输入喷嘴的流出系数" />
+				</el-form-item>
+				<el-form-item label="标况体积流量m³/s" prop="dVFlowb">
+					<el-input v-model="form.dVFlowb" placeholder="请输入标况体积流量m³/s" />
+				</el-form-item>
+				<el-form-item label="工况体积流量" prop="dVFlowf">
+					<el-input v-model="form.dVFlowf" placeholder="请输入工况体积流量" />
+				</el-form-item>
+				<el-form-item label="标况质量流量" prop="dMFlowb">
+					<el-input v-model="form.dMFlowb" placeholder="请输入标况质量流量" />
+				</el-form-item>
+				<el-form-item label="标况能量流量" prop="dEFlowb">
+					<el-input v-model="form.dEFlowb" placeholder="请输入标况能量流量" />
+				</el-form-item>
+				<el-form-item label="管道内天然气流速" prop="dVelocityFlow">
+					<el-input v-model="form.dVelocityFlow" placeholder="请输入管道内天然气流速" />
+				</el-form-item>
+				<el-form-item label="压力损失" prop="dPressLost">
+					<el-input v-model="form.dPressLost" placeholder="请输入压力损失" />
+				</el-form-item>
+				<el-form-item label="直径比" prop="dBeta">
+					<el-input v-model="form.dBeta" placeholder="请输入直径比" />
+				</el-form-item>
+				<el-form-item label="等熵指数" prop="dKappa">
+					<el-input v-model="form.dKappa" placeholder="请输入等熵指数" />
+				</el-form-item>
+				<el-form-item label="取样编号" prop="sampleno">
+					<el-input v-model="form.sampleno" placeholder="请输入取样编号" />
+				</el-form-item>
+				<el-form-item label="仪表编号" prop="meterno">
+					<el-input v-model="form.meterno" placeholder="请输入仪表编号" />
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button type="primary" @click="submitForm">确 定</el-button>
+					<el-button @click="cancel">取 消</el-button>
+				</div>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup name="Meterresult">
+import { listMeterresult, getMeterresult, delMeterresult, addMeterresult, updateMeterresult } from '@/api/ngtools/meterresult';
+
+const { proxy } = getCurrentInstance();
+
+const meterresultList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref('');
+
+const data = reactive({
+	form: {},
+	queryParams: {
+		pageNum: 1,
+		pageSize: 10,
+		createName: null,
+		updateName: null,
+		ybbh: null,
+		dE: null,
+		dFG: null,
+		dFT: null,
+		dDViscosity: null,
+		dDExpCoefficient: null,
+		dRnPipe: null,
+		dBk: null,
+		dRoughNessPipe: null,
+		dCdCorrect: null,
+		dCdNozell: null,
+		dVFlowb: null,
+		dVFlowf: null,
+		dMFlowb: null,
+		dEFlowb: null,
+		dVelocityFlow: null,
+		dPressLost: null,
+		dBeta: null,
+		dKappa: null,
+		sampleno: null,
+		meterno: null
+	},
+	rules: {}
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询流量计算结果列表 */
+function getList() {
+	loading.value = true;
+	listMeterresult(queryParams.value).then((response) => {
+		meterresultList.value = response.rows;
+		total.value = response.total;
+		loading.value = false;
+	});
+}
+
+// 取消按钮
+function cancel() {
+	open.value = false;
+	reset();
+}
+
+// 表单重置
+function reset() {
+	form.value = {
+		id: null,
+		createName: null,
+		createBy: null,
+		createTime: null,
+		updateName: null,
+		updateBy: null,
+		updateTime: null,
+		ybbh: null,
+		dE: null,
+		dFG: null,
+		dFT: null,
+		dDViscosity: null,
+		dDExpCoefficient: null,
+		dRnPipe: null,
+		dBk: null,
+		dRoughNessPipe: null,
+		dCdCorrect: null,
+		dCdNozell: null,
+		dVFlowb: null,
+		dVFlowf: null,
+		dMFlowb: null,
+		dEFlowb: null,
+		dVelocityFlow: null,
+		dPressLost: null,
+		dBeta: null,
+		dKappa: null,
+		sampleno: null,
+		meterno: null
+	};
+	proxy.resetForm('meterresultRef');
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+	queryParams.value.pageNum = 1;
+	getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+	proxy.resetForm('queryRef');
+	handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+	ids.value = selection.map((item) => item.id);
+	single.value = selection.length != 1;
+	multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+	reset();
+	open.value = true;
+	title.value = '添加流量计算结果';
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+	reset();
+	const _id = row.id || ids.value;
+	getMeterresult(_id).then((response) => {
+		form.value = response.data;
+		open.value = true;
+		title.value = '修改流量计算结果';
+	});
+}
+
+/** 提交按钮 */
+function submitForm() {
+	proxy.$refs['meterresultRef'].validate((valid) => {
+		if (valid) {
+			if (form.value.id != null) {
+				updateMeterresult(form.value).then((response) => {
+					proxy.$modal.msgSuccess('修改成功');
+					open.value = false;
+					getList();
+				});
+			} else {
+				addMeterresult(form.value).then((response) => {
+					proxy.$modal.msgSuccess('新增成功');
+					open.value = false;
+					getList();
+				});
+			}
+		}
+	});
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+	const _ids = row.id || ids.value;
+	proxy.$modal
+		.confirm('是否确认删除流量计算结果编号为"' + _ids + '"的数据项？')
+		.then(function () {
+			return delMeterresult(_ids);
+		})
+		.then(() => {
+			getList();
+			proxy.$modal.msgSuccess('删除成功');
+		})
+		.catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+	proxy.download(
+		'ngtools/meterresult/export',
+		{
+			...queryParams.value
+		},
+		`meterresult_${new Date().getTime()}.xlsx`
+	);
+}
+
+getList();
+</script>
diff --git a/src/views/ngtools/ngpar/index.vue b/src/views/ngtools/ngpar/index.vue
new file mode 100644
index 0000000..0393727
--- /dev/null
+++ b/src/views/ngtools/ngpar/index.vue
@@ -0,0 +1,693 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+			<el-form-item label="创建人名称" prop="createName">
+				<el-input v-model="queryParams.createName" placeholder="请输入创建人名称" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="更新人名称" prop="updateName">
+				<el-input v-model="queryParams.updateName" placeholder="请输入更新人名称" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="气体摩尔组成" prop="adMixture">
+				<el-input v-model="queryParams.adMixture" placeholder="请输入气体摩尔组成" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="气体体积组成" prop="adMixtureV">
+				<el-input v-model="queryParams.adMixtureV" placeholder="请输入气体体积组成" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="气体质量组成" prop="adMixtureD">
+				<el-input v-model="queryParams.adMixtureD" placeholder="请输入气体质量组成" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="参比条件" prop="dCbtj">
+				<el-select v-model="queryParams.dCbtj" placeholder="请选择参比条件" clearable>
+					<el-option v-for="dict in ngtools_cbtj" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="参比压力" prop="dPb">
+				<el-input v-model="queryParams.dPb" placeholder="请输入参比压力" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="参比温度" prop="dTb">
+				<el-input v-model="queryParams.dTb" placeholder="请输入参比温度" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="绝对压力" prop="dPf">
+				<el-input v-model="queryParams.dPf" placeholder="请输入绝对压力" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="工况温度" prop="dTf">
+				<el-input v-model="queryParams.dTf" placeholder="请输入工况温度" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="分子量" prop="dMrx">
+				<el-input v-model="queryParams.dMrx" placeholder="请输入分子量" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="标况压缩因子" prop="dZb">
+				<el-input v-model="queryParams.dZb" placeholder="请输入标况压缩因子" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="工况压缩因子" prop="dZf">
+				<el-input v-model="queryParams.dZf" placeholder="请输入工况压缩因子" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="超压缩系数" prop="dFpv">
+				<el-input v-model="queryParams.dFpv" placeholder="请输入超压缩系数" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="标况摩尔密度" prop="dDb">
+				<el-input v-model="queryParams.dDb" placeholder="请输入标况摩尔密度" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="工况摩尔密度" prop="dDf">
+				<el-input v-model="queryParams.dDf" placeholder="请输入工况摩尔密度" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="标况质量密度" prop="dRhob">
+				<el-input v-model="queryParams.dRhob" placeholder="请输入标况质量密度" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="工况质量密度" prop="dRhof">
+				<el-input v-model="queryParams.dRhof" placeholder="请输入工况质量密度" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="理想气体的相对密度" prop="drdIdeal">
+				<el-input v-model="queryParams.drdIdeal" placeholder="请输入理想气体的相对密度" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="真实气体的相对密度" prop="drdReal">
+				<el-input v-model="queryParams.drdReal" placeholder="请输入真实气体的相对密度" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="理想气体的比焓" prop="dHo">
+				<el-input v-model="queryParams.dHo" placeholder="请输入理想气体的比焓" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="真实气体的焓" prop="dH">
+				<el-input v-model="queryParams.dH" placeholder="请输入真实气体的焓" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="真实气体的熵" prop="dS">
+				<el-input v-model="queryParams.dS" placeholder="请输入真实气体的熵" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="理想气体定压热容" prop="dCpi">
+				<el-input v-model="queryParams.dCpi" placeholder="请输入理想气体定压热容" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="定压热容" prop="dCp">
+				<el-input v-model="queryParams.dCp" placeholder="请输入定压热容" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="定容积热容" prop="dCv">
+				<el-input v-model="queryParams.dCv" placeholder="请输入定容积热容" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="比热比" prop="dk">
+				<el-input v-model="queryParams.dk" placeholder="请输入比热比" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="等熵指数" prop="dKappa">
+				<el-input v-model="queryParams.dKappa" placeholder="请输入等熵指数" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="声速" prop="dSOS">
+				<el-input v-model="queryParams.dSOS" placeholder="请输入声速" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="临界流函数" prop="dCstar">
+				<el-input v-model="queryParams.dCstar" placeholder="请输入临界流函数" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="摩尔高位发热量" prop="dHhvMol">
+				<el-input v-model="queryParams.dHhvMol" placeholder="请输入摩尔高位发热量" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="摩尔低位发热量" prop="dLhvMol">
+				<el-input v-model="queryParams.dLhvMol" placeholder="请输入摩尔低位发热量" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="体积高位发热量" prop="dHhvv">
+				<el-input v-model="queryParams.dHhvv" placeholder="请输入体积高位发热量" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="体积低位发热量" prop="dLhvv">
+				<el-input v-model="queryParams.dLhvv" placeholder="请输入体积低位发热量" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="质量高位发热量" prop="dHhvm">
+				<el-input v-model="queryParams.dHhvm" placeholder="请输入质量高位发热量" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="质量地位发热量" prop="dLhvm">
+				<el-input v-model="queryParams.dLhvm" placeholder="请输入质量地位发热量" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="标况压缩因子" prop="dZb11062">
+				<el-input v-model="queryParams.dZb11062" placeholder="请输入标况压缩因子" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="标况质量密度" prop="dRhob11062">
+				<el-input v-model="queryParams.dRhob11062" placeholder="请输入标况质量密度" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="工况质量密度" prop="dRhof11062">
+				<el-input v-model="queryParams.dRhof11062" placeholder="请输入工况质量密度" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="理想气体的相对密度" prop="drdIdeal11062">
+				<el-input v-model="queryParams.drdIdeal11062" placeholder="请输入理想气体的相对密度" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="真实气体的相对密度" prop="drdReal11062">
+				<el-input v-model="queryParams.drdReal11062" placeholder="请输入真实气体的相对密度" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="真实气体的沃泊指数" prop="dWobbeIndex">
+				<el-input v-model="queryParams.dWobbeIndex" placeholder="请输入真实气体的沃泊指数" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="临界压力" prop="dPc">
+				<el-input v-model="queryParams.dPc" placeholder="请输入临界压力" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="临界温度" prop="dTC">
+				<el-input v-model="queryParams.dTC" placeholder="请输入临界温度" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="爆炸上限" prop="dBzsx">
+				<el-input v-model="queryParams.dBzsx" placeholder="请输入爆炸上限" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="爆炸下限" prop="dBzxx">
+				<el-input v-model="queryParams.dBzxx" placeholder="请输入爆炸下限" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="总炭含量(kg/m3)" prop="dTotalC">
+				<el-input v-model="queryParams.dTotalC" placeholder="请输入总炭含量(kg/m3)" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="C2组分含量(kg/m3)" prop="dC2">
+				<el-input v-model="queryParams.dC2" placeholder="请输入C2组分含量(kg/m3)" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="C2以上组分含量(kg/m3)" prop="dC2j">
+				<el-input v-model="queryParams.dC2j" placeholder="请输入C2以上组分含量(kg/m3)" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="C3以上组分含量(kg/m3)" prop="dC3j">
+				<el-input v-model="queryParams.dC3j" placeholder="请输入C3以上组分含量(kg/m3)" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="C4以上组分含量(kg/m3)" prop="dC4j">
+				<el-input v-model="queryParams.dC4j" placeholder="请输入C4以上组分含量(kg/m3)" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="C5以上组分含量(kg/m3)" prop="dC5j">
+				<el-input v-model="queryParams.dC5j" placeholder="请输入C5以上组分含量(kg/m3)" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="C6以上组分含量(kg/m3)" prop="dC6j">
+				<el-input v-model="queryParams.dC6j" placeholder="请输入C6以上组分含量(kg/m3)" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item label="C3C4组分含量(kg/m3)" prop="dC3C4">
+				<el-input v-model="queryParams.dC3C4" placeholder="请输入C3C4组分含量(kg/m3)" clearable @keyup.enter="handleQuery" />
+			</el-form-item>
+			<el-form-item>
+				<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+				<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['ngtools:ngpar:add']">新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['ngtools:ngpar:edit']">修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['ngtools:ngpar:remove']">删除</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['ngtools:ngpar:export']">导出</el-button>
+			</el-col>
+			<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="ngparList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="ID" align="center" prop="id" />
+			<el-table-column label="创建人名称" align="center" prop="createName" />
+			<el-table-column label="更新人名称" align="center" prop="updateName" />
+			<el-table-column label="气体摩尔组成" align="center" prop="adMixture" />
+			<el-table-column label="气体体积组成" align="center" prop="adMixtureV" />
+			<el-table-column label="气体质量组成" align="center" prop="adMixtureD" />
+			<el-table-column label="参比条件" align="center" prop="dCbtj">
+				<template #default="scope">
+					<dict-tag :options="ngtools_cbtj" :value="scope.row.dCbtj" />
+				</template>
+			</el-table-column>
+			<el-table-column label="参比压力" align="center" prop="dPb" />
+			<el-table-column label="参比温度" align="center" prop="dTb" />
+			<el-table-column label="绝对压力" align="center" prop="dPf" />
+			<el-table-column label="工况温度" align="center" prop="dTf" />
+			<el-table-column label="分子量" align="center" prop="dMrx" />
+			<el-table-column label="标况压缩因子" align="center" prop="dZb" />
+			<el-table-column label="工况压缩因子" align="center" prop="dZf" />
+			<el-table-column label="超压缩系数" align="center" prop="dFpv" />
+			<el-table-column label="标况摩尔密度" align="center" prop="dDb" />
+			<el-table-column label="工况摩尔密度" align="center" prop="dDf" />
+			<el-table-column label="标况质量密度" align="center" prop="dRhob" />
+			<el-table-column label="工况质量密度" align="center" prop="dRhof" />
+			<el-table-column label="理想气体的相对密度" align="center" prop="drdIdeal" />
+			<el-table-column label="真实气体的相对密度" align="center" prop="drdReal" />
+			<el-table-column label="理想气体的比焓" align="center" prop="dHo" />
+			<el-table-column label="真实气体的焓" align="center" prop="dH" />
+			<el-table-column label="真实气体的熵" align="center" prop="dS" />
+			<el-table-column label="理想气体定压热容" align="center" prop="dCpi" />
+			<el-table-column label="定压热容" align="center" prop="dCp" />
+			<el-table-column label="定容积热容" align="center" prop="dCv" />
+			<el-table-column label="比热比" align="center" prop="dk" />
+			<el-table-column label="等熵指数" align="center" prop="dKappa" />
+			<el-table-column label="声速" align="center" prop="dSOS" />
+			<el-table-column label="临界流函数" align="center" prop="dCstar" />
+			<el-table-column label="摩尔高位发热量" align="center" prop="dHhvMol" />
+			<el-table-column label="摩尔低位发热量" align="center" prop="dLhvMol" />
+			<el-table-column label="体积高位发热量" align="center" prop="dHhvv" />
+			<el-table-column label="体积低位发热量" align="center" prop="dLhvv" />
+			<el-table-column label="质量高位发热量" align="center" prop="dHhvm" />
+			<el-table-column label="质量地位发热量" align="center" prop="dLhvm" />
+			<el-table-column label="标况压缩因子" align="center" prop="dZb11062" />
+			<el-table-column label="标况质量密度" align="center" prop="dRhob11062" />
+			<el-table-column label="工况质量密度" align="center" prop="dRhof11062" />
+			<el-table-column label="理想气体的相对密度" align="center" prop="drdIdeal11062" />
+			<el-table-column label="真实气体的相对密度" align="center" prop="drdReal11062" />
+			<el-table-column label="真实气体的沃泊指数" align="center" prop="dWobbeIndex" />
+			<el-table-column label="临界压力" align="center" prop="dPc" />
+			<el-table-column label="临界温度" align="center" prop="dTC" />
+			<el-table-column label="爆炸上限" align="center" prop="dBzsx" />
+			<el-table-column label="爆炸下限" align="center" prop="dBzxx" />
+			<el-table-column label="总炭含量(kg/m3)" align="center" prop="dTotalC" />
+			<el-table-column label="C2组分含量(kg/m3)" align="center" prop="dC2" />
+			<el-table-column label="C2以上组分含量(kg/m3)" align="center" prop="dC2j" />
+			<el-table-column label="C3以上组分含量(kg/m3)" align="center" prop="dC3j" />
+			<el-table-column label="C4以上组分含量(kg/m3)" align="center" prop="dC4j" />
+			<el-table-column label="C5以上组分含量(kg/m3)" align="center" prop="dC5j" />
+			<el-table-column label="C6以上组分含量(kg/m3)" align="center" prop="dC6j" />
+			<el-table-column label="C3C4组分含量(kg/m3)" align="center" prop="dC3C4" />
+			<el-table-column label="取样编号" align="center" prop="sampleno" />
+			<el-table-column label="仪表编号" align="center" prop="meterno" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template #default="scope">
+					<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['ngtools:ngpar:edit']">修改</el-button>
+					<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['ngtools:ngpar:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+
+		<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改天然气物性参数对话框 -->
+		<el-dialog :title="title" v-model="open" width="500px" append-to-body>
+			<el-form ref="ngparRef" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="创建人名称" prop="createName">
+					<el-input v-model="form.createName" placeholder="请输入创建人名称" />
+				</el-form-item>
+				<el-form-item label="更新人名称" prop="updateName">
+					<el-input v-model="form.updateName" placeholder="请输入更新人名称" />
+				</el-form-item>
+				<el-form-item label="气体摩尔组成" prop="adMixture">
+					<el-input v-model="form.adMixture" placeholder="请输入气体摩尔组成" />
+				</el-form-item>
+				<el-form-item label="气体体积组成" prop="adMixtureV">
+					<el-input v-model="form.adMixtureV" placeholder="请输入气体体积组成" />
+				</el-form-item>
+				<el-form-item label="气体质量组成" prop="adMixtureD">
+					<el-input v-model="form.adMixtureD" placeholder="请输入气体质量组成" />
+				</el-form-item>
+				<el-form-item label="参比条件" prop="dCbtj">
+					<el-select v-model="form.dCbtj" placeholder="请选择参比条件">
+						<el-option v-for="dict in ngtools_cbtj" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="参比压力" prop="dPb">
+					<el-input v-model="form.dPb" placeholder="请输入参比压力" />
+				</el-form-item>
+				<el-form-item label="参比温度" prop="dTb">
+					<el-input v-model="form.dTb" placeholder="请输入参比温度" />
+				</el-form-item>
+				<el-form-item label="绝对压力" prop="dPf">
+					<el-input v-model="form.dPf" placeholder="请输入绝对压力" />
+				</el-form-item>
+				<el-form-item label="工况温度" prop="dTf">
+					<el-input v-model="form.dTf" placeholder="请输入工况温度" />
+				</el-form-item>
+				<el-form-item label="分子量" prop="dMrx">
+					<el-input v-model="form.dMrx" placeholder="请输入分子量" />
+				</el-form-item>
+				<el-form-item label="标况压缩因子" prop="dZb">
+					<el-input v-model="form.dZb" placeholder="请输入标况压缩因子" />
+				</el-form-item>
+				<el-form-item label="工况压缩因子" prop="dZf">
+					<el-input v-model="form.dZf" placeholder="请输入工况压缩因子" />
+				</el-form-item>
+				<el-form-item label="超压缩系数" prop="dFpv">
+					<el-input v-model="form.dFpv" placeholder="请输入超压缩系数" />
+				</el-form-item>
+				<el-form-item label="标况摩尔密度" prop="dDb">
+					<el-input v-model="form.dDb" placeholder="请输入标况摩尔密度" />
+				</el-form-item>
+				<el-form-item label="工况摩尔密度" prop="dDf">
+					<el-input v-model="form.dDf" placeholder="请输入工况摩尔密度" />
+				</el-form-item>
+				<el-form-item label="标况质量密度" prop="dRhob">
+					<el-input v-model="form.dRhob" placeholder="请输入标况质量密度" />
+				</el-form-item>
+				<el-form-item label="工况质量密度" prop="dRhof">
+					<el-input v-model="form.dRhof" placeholder="请输入工况质量密度" />
+				</el-form-item>
+				<el-form-item label="理想气体的相对密度" prop="drdIdeal">
+					<el-input v-model="form.drdIdeal" placeholder="请输入理想气体的相对密度" />
+				</el-form-item>
+				<el-form-item label="真实气体的相对密度" prop="drdReal">
+					<el-input v-model="form.drdReal" placeholder="请输入真实气体的相对密度" />
+				</el-form-item>
+				<el-form-item label="理想气体的比焓" prop="dHo">
+					<el-input v-model="form.dHo" placeholder="请输入理想气体的比焓" />
+				</el-form-item>
+				<el-form-item label="真实气体的焓" prop="dH">
+					<el-input v-model="form.dH" placeholder="请输入真实气体的焓" />
+				</el-form-item>
+				<el-form-item label="真实气体的熵" prop="dS">
+					<el-input v-model="form.dS" placeholder="请输入真实气体的熵" />
+				</el-form-item>
+				<el-form-item label="理想气体定压热容" prop="dCpi">
+					<el-input v-model="form.dCpi" placeholder="请输入理想气体定压热容" />
+				</el-form-item>
+				<el-form-item label="定压热容" prop="dCp">
+					<el-input v-model="form.dCp" placeholder="请输入定压热容" />
+				</el-form-item>
+				<el-form-item label="定容积热容" prop="dCv">
+					<el-input v-model="form.dCv" placeholder="请输入定容积热容" />
+				</el-form-item>
+				<el-form-item label="比热比" prop="dk">
+					<el-input v-model="form.dk" placeholder="请输入比热比" />
+				</el-form-item>
+				<el-form-item label="等熵指数" prop="dKappa">
+					<el-input v-model="form.dKappa" placeholder="请输入等熵指数" />
+				</el-form-item>
+				<el-form-item label="声速" prop="dSOS">
+					<el-input v-model="form.dSOS" placeholder="请输入声速" />
+				</el-form-item>
+				<el-form-item label="临界流函数" prop="dCstar">
+					<el-input v-model="form.dCstar" placeholder="请输入临界流函数" />
+				</el-form-item>
+				<el-form-item label="摩尔高位发热量" prop="dHhvMol">
+					<el-input v-model="form.dHhvMol" placeholder="请输入摩尔高位发热量" />
+				</el-form-item>
+				<el-form-item label="摩尔低位发热量" prop="dLhvMol">
+					<el-input v-model="form.dLhvMol" placeholder="请输入摩尔低位发热量" />
+				</el-form-item>
+				<el-form-item label="体积高位发热量" prop="dHhvv">
+					<el-input v-model="form.dHhvv" placeholder="请输入体积高位发热量" />
+				</el-form-item>
+				<el-form-item label="体积低位发热量" prop="dLhvv">
+					<el-input v-model="form.dLhvv" placeholder="请输入体积低位发热量" />
+				</el-form-item>
+				<el-form-item label="质量高位发热量" prop="dHhvm">
+					<el-input v-model="form.dHhvm" placeholder="请输入质量高位发热量" />
+				</el-form-item>
+				<el-form-item label="质量地位发热量" prop="dLhvm">
+					<el-input v-model="form.dLhvm" placeholder="请输入质量地位发热量" />
+				</el-form-item>
+				<el-form-item label="标况压缩因子" prop="dZb11062">
+					<el-input v-model="form.dZb11062" placeholder="请输入标况压缩因子" />
+				</el-form-item>
+				<el-form-item label="标况质量密度" prop="dRhob11062">
+					<el-input v-model="form.dRhob11062" placeholder="请输入标况质量密度" />
+				</el-form-item>
+				<el-form-item label="工况质量密度" prop="dRhof11062">
+					<el-input v-model="form.dRhof11062" placeholder="请输入工况质量密度" />
+				</el-form-item>
+				<el-form-item label="理想气体的相对密度" prop="drdIdeal11062">
+					<el-input v-model="form.drdIdeal11062" placeholder="请输入理想气体的相对密度" />
+				</el-form-item>
+				<el-form-item label="真实气体的相对密度" prop="drdReal11062">
+					<el-input v-model="form.drdReal11062" placeholder="请输入真实气体的相对密度" />
+				</el-form-item>
+				<el-form-item label="真实气体的沃泊指数" prop="dWobbeIndex">
+					<el-input v-model="form.dWobbeIndex" placeholder="请输入真实气体的沃泊指数" />
+				</el-form-item>
+				<el-form-item label="临界压力" prop="dPc">
+					<el-input v-model="form.dPc" placeholder="请输入临界压力" />
+				</el-form-item>
+				<el-form-item label="临界温度" prop="dTC">
+					<el-input v-model="form.dTC" placeholder="请输入临界温度" />
+				</el-form-item>
+				<el-form-item label="爆炸上限" prop="dBzsx">
+					<el-input v-model="form.dBzsx" placeholder="请输入爆炸上限" />
+				</el-form-item>
+				<el-form-item label="爆炸下限" prop="dBzxx">
+					<el-input v-model="form.dBzxx" placeholder="请输入爆炸下限" />
+				</el-form-item>
+				<el-form-item label="总炭含量(kg/m3)" prop="dTotalC">
+					<el-input v-model="form.dTotalC" placeholder="请输入总炭含量(kg/m3)" />
+				</el-form-item>
+				<el-form-item label="C2组分含量(kg/m3)" prop="dC2">
+					<el-input v-model="form.dC2" placeholder="请输入C2组分含量(kg/m3)" />
+				</el-form-item>
+				<el-form-item label="C2以上组分含量(kg/m3)" prop="dC2j">
+					<el-input v-model="form.dC2j" placeholder="请输入C2以上组分含量(kg/m3)" />
+				</el-form-item>
+				<el-form-item label="C3以上组分含量(kg/m3)" prop="dC3j">
+					<el-input v-model="form.dC3j" placeholder="请输入C3以上组分含量(kg/m3)" />
+				</el-form-item>
+				<el-form-item label="C4以上组分含量(kg/m3)" prop="dC4j">
+					<el-input v-model="form.dC4j" placeholder="请输入C4以上组分含量(kg/m3)" />
+				</el-form-item>
+				<el-form-item label="C5以上组分含量(kg/m3)" prop="dC5j">
+					<el-input v-model="form.dC5j" placeholder="请输入C5以上组分含量(kg/m3)" />
+				</el-form-item>
+				<el-form-item label="C6以上组分含量(kg/m3)" prop="dC6j">
+					<el-input v-model="form.dC6j" placeholder="请输入C6以上组分含量(kg/m3)" />
+				</el-form-item>
+				<el-form-item label="C3C4组分含量(kg/m3)" prop="dC3C4">
+					<el-input v-model="form.dC3C4" placeholder="请输入C3C4组分含量(kg/m3)" />
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button type="primary" @click="submitForm">确 定</el-button>
+					<el-button @click="cancel">取 消</el-button>
+				</div>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup name="Ngpar">
+import { listNgpar, getNgpar, delNgpar, addNgpar, updateNgpar } from '@/api/ngtools/ngpar';
+
+const { proxy } = getCurrentInstance();
+const { ngtools_cbtj } = proxy.useDict('ngtools_cbtj');
+
+const ngparList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref('');
+
+const data = reactive({
+	form: {},
+	queryParams: {
+		pageNum: 1,
+		pageSize: 10,
+		createName: null,
+		updateName: null,
+		adMixture: null,
+		adMixtureV: null,
+		adMixtureD: null,
+		dCbtj: null,
+		dPb: null,
+		dTb: null,
+		dPf: null,
+		dTf: null,
+		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,
+		sampleno: null,
+		meterno: null
+	},
+	rules: {}
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询天然气物性参数列表 */
+function getList() {
+	loading.value = true;
+	listNgpar(queryParams.value).then((response) => {
+		ngparList.value = response.rows;
+		total.value = response.total;
+		loading.value = false;
+	});
+}
+
+// 取消按钮
+function cancel() {
+	open.value = false;
+	reset();
+}
+
+// 表单重置
+function reset() {
+	form.value = {
+		id: null,
+		createName: null,
+		createBy: null,
+		createTime: null,
+		updateName: null,
+		updateBy: null,
+		updateTime: null,
+		adMixture: null,
+		adMixtureV: null,
+		adMixtureD: null,
+		dCbtj: null,
+		dPb: null,
+		dTb: null,
+		dPf: null,
+		dTf: null,
+		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,
+		sampleno: null,
+		meterno: null
+	};
+	proxy.resetForm('ngparRef');
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+	queryParams.value.pageNum = 1;
+	getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+	proxy.resetForm('queryRef');
+	handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+	ids.value = selection.map((item) => item.id);
+	single.value = selection.length != 1;
+	multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+	reset();
+	open.value = true;
+	title.value = '添加天然气物性参数';
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+	reset();
+	const _id = row.id || ids.value;
+	getNgpar(_id).then((response) => {
+		form.value = response.data;
+		open.value = true;
+		title.value = '修改天然气物性参数';
+	});
+}
+
+/** 提交按钮 */
+function submitForm() {
+	proxy.$refs['ngparRef'].validate((valid) => {
+		if (valid) {
+			if (form.value.id != null) {
+				updateNgpar(form.value).then((response) => {
+					proxy.$modal.msgSuccess('修改成功');
+					open.value = false;
+					getList();
+				});
+			} else {
+				addNgpar(form.value).then((response) => {
+					proxy.$modal.msgSuccess('新增成功');
+					open.value = false;
+					getList();
+				});
+			}
+		}
+	});
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+	const _ids = row.id || ids.value;
+	proxy.$modal
+		.confirm('是否确认删除天然气物性参数编号为"' + _ids + '"的数据项？')
+		.then(function () {
+			return delNgpar(_ids);
+		})
+		.then(() => {
+			getList();
+			proxy.$modal.msgSuccess('删除成功');
+		})
+		.catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+	proxy.download(
+		'ngtools/ngpar/export',
+		{
+			...queryParams.value
+		},
+		`ngpar_${new Date().getTime()}.xlsx`
+	);
+}
+
+getList();
+</script>
diff --git a/src/views/system/sysUnitConvert/index.vue b/src/views/system/sysUnitConvert/index.vue
new file mode 100644
index 0000000..b08cb99
--- /dev/null
+++ b/src/views/system/sysUnitConvert/index.vue
@@ -0,0 +1,265 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+			<el-form-item label="单位类型" prop="unitType">
+				<el-select v-model="queryParams.unitType" placeholder="请选择单位类型" clearable style="width: 100px">
+					<el-option v-for="dict in unit_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="单位名称" prop="unitName">
+				<el-input v-model="queryParams.unitName" placeholder="请输入单位名称" clearable @keyup.enter="handleQuery" style="width: 120px" />
+			</el-form-item>
+			<el-form-item label="是否基准" prop="baseUnit">
+				<el-select v-model="queryParams.baseUnit" placeholder="请选择是否基准" clearable style="width: 100px">
+					<el-option v-for="dict in sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item>
+				<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+				<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:sysUnitConvert:add']">新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:sysUnitConvert:edit']">修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:sysUnitConvert:remove']">删除</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:sysUnitConvert:export']">导出</el-button>
+			</el-col>
+			<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="sysUnitConvertList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="编号" align="center" prop="id" />
+			<el-table-column label="单位类型" align="center" prop="unitType">
+				<template #default="scope">
+					<dict-tag :options="unit_type" :value="scope.row.unitType" />
+				</template>
+			</el-table-column>
+			<el-table-column label="单位名称" align="center" prop="unitName" />
+			<el-table-column label="是否基准" align="center" prop="baseUnit">
+				<template #default="scope">
+					<dict-tag :options="sys_yes_no" :value="scope.row.baseUnit" />
+				</template>
+			</el-table-column>
+			<el-table-column label="换算因子" align="center" prop="conversionFactor" />
+			<el-table-column label="类型名称" align="center" prop="unitTypeName" />
+			<el-table-column label="状态" align="center" prop="status">
+				<template #default="scope">
+					<dict-tag :options="sys_yes_no" :value="scope.row.status" />
+				</template>
+			</el-table-column>
+			<el-table-column label="单位序号" align="center" prop="unitOrder" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template #default="scope">
+					<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:sysUnitConvert:edit']">修改</el-button>
+					<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:sysUnitConvert:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+
+		<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改单位换算对话框 -->
+		<el-dialog :title="title" v-model="open" width="500px" append-to-body>
+			<el-form ref="sysUnitConvertRef" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="单位类型" prop="unitType">
+					<el-select v-model="form.unitType" placeholder="请选择单位类型">
+						<el-option v-for="dict in unit_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="单位名称" prop="unitName">
+					<el-input v-model="form.unitName" placeholder="请输入单位名称" />
+				</el-form-item>
+				<el-form-item label="是否基准" prop="baseUnit">
+					<el-radio-group v-model="form.baseUnit">
+						<el-radio v-for="dict in sys_yes_no" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item label="换算因子" prop="conversionFactor">
+					<el-input v-model="form.conversionFactor" placeholder="请输入换算因子" />
+				</el-form-item>
+				<el-form-item label="类型名称" prop="unitTypeName">
+					<el-input v-model="form.unitTypeName" placeholder="请输入类型名称" />
+				</el-form-item>
+				<el-form-item label="状态" prop="status">
+					<el-radio-group v-model="form.status">
+						<el-radio v-for="dict in sys_yes_no" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item label="单位序号" prop="unitOrder">
+					<el-input v-model="form.unitOrder" placeholder="请输入单位序号" />
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button type="primary" @click="submitForm">确 定</el-button>
+					<el-button @click="cancel">取 消</el-button>
+				</div>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup name="SysUnitConvert">
+import { listSysUnitConvert, getSysUnitConvert, delSysUnitConvert, addSysUnitConvert, updateSysUnitConvert } from '@/api/system/sysUnitConvert';
+
+const { proxy } = getCurrentInstance();
+const { sys_yes_no, unit_type } = proxy.useDict('sys_yes_no', 'unit_type');
+
+const sysUnitConvertList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref('');
+
+const data = reactive({
+	form: {},
+	queryParams: {
+		pageNum: 1,
+		pageSize: 10,
+		unitType: null,
+		unitName: null,
+		baseUnit: null
+	},
+	rules: {
+		unitType: [{ required: true, message: '单位类型不能为空', trigger: 'change' }],
+		unitName: [{ required: true, message: '单位名称不能为空', trigger: 'blur' }],
+		baseUnit: [{ required: true, message: '是否基准不能为空', trigger: 'change' }],
+		conversionFactor: [{ required: true, message: '换算因子不能为空', trigger: 'blur' }],
+		unitTypeName: [{ required: true, message: '类型名称不能为空', trigger: 'blur' }],
+		unitOrder: [{ required: true, message: '单位序号不能为空', trigger: 'blur' }]
+	}
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询单位换算列表 */
+function getList() {
+	loading.value = true;
+	listSysUnitConvert(queryParams.value).then((response) => {
+		sysUnitConvertList.value = response.rows;
+		total.value = response.total;
+		loading.value = false;
+	});
+}
+
+// 取消按钮
+function cancel() {
+	open.value = false;
+	reset();
+}
+
+// 表单重置
+function reset() {
+	form.value = {
+		id: null,
+		unitType: null,
+		unitName: null,
+		baseUnit: null,
+		conversionFactor: null,
+		unitTypeName: null,
+		status: null,
+		unitOrder: null
+	};
+	proxy.resetForm('sysUnitConvertRef');
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+	queryParams.value.pageNum = 1;
+	getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+	proxy.resetForm('queryRef');
+	handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+	ids.value = selection.map((item) => item.id);
+	single.value = selection.length != 1;
+	multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+	reset();
+	open.value = true;
+	title.value = '添加单位换算';
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+	reset();
+	const _id = row.id || ids.value;
+	getSysUnitConvert(_id).then((response) => {
+		form.value = response.data;
+		open.value = true;
+		title.value = '修改单位换算';
+	});
+}
+
+/** 提交按钮 */
+function submitForm() {
+	proxy.$refs['sysUnitConvertRef'].validate((valid) => {
+		if (valid) {
+			if (form.value.id != null) {
+				updateSysUnitConvert(form.value).then((response) => {
+					proxy.$modal.msgSuccess('修改成功');
+					open.value = false;
+					getList();
+				});
+			} else {
+				addSysUnitConvert(form.value).then((response) => {
+					proxy.$modal.msgSuccess('新增成功');
+					open.value = false;
+					getList();
+				});
+			}
+		}
+	});
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+	const _ids = row.id || ids.value;
+	proxy.$modal
+		.confirm('是否确认删除单位换算编号为"' + _ids + '"的数据项？')
+		.then(function () {
+			return delSysUnitConvert(_ids);
+		})
+		.then(() => {
+			getList();
+			proxy.$modal.msgSuccess('删除成功');
+		})
+		.catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+	proxy.download(
+		'system/sysUnitConvert/export',
+		{
+			...queryParams.value
+		},
+		`sysUnitConvert_${new Date().getTime()}.xlsx`
+	);
+}
+
+getList();
+</script>
diff --git a/src/views/system/treeDict/index.vue b/src/views/system/treeDict/index.vue
new file mode 100644
index 0000000..31b39cd
--- /dev/null
+++ b/src/views/system/treeDict/index.vue
@@ -0,0 +1,286 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="字典文本" prop="dictText">
+        <el-input
+          v-model="queryParams.dictText"
+          placeholder="请输入字典文本"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="字典值" prop="dictValue">
+        <el-input
+          v-model="queryParams.dictValue"
+          placeholder="请输入字典值"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="父ID" prop="pid">
+        <el-input
+          v-model="queryParams.pid"
+          placeholder="请输入父ID"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门ID" prop="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入部门ID"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="排序" prop="dictSort">
+        <el-input
+          v-model="queryParams.dictSort"
+          placeholder="请输入排序"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['system:treeDict:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="Sort"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="treeDictList"
+      row-key="id"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column label="字典文本" prop="dictText" />
+      <el-table-column label="字典值" align="center" prop="dictValue" />
+      <el-table-column label="父ID" align="center" prop="pid" />
+      <el-table-column label="部门ID" align="center" prop="deptId" />
+      <el-table-column label="排序" align="center" prop="dictSort" />
+      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:treeDict:edit']">修改</el-button>
+          <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:treeDict:add']">新增</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:treeDict:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改树形字典对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="treeDictRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="字典文本" prop="dictText">
+          <el-input v-model="form.dictText" placeholder="请输入字典文本" />
+        </el-form-item>
+        <el-form-item label="字典值" prop="dictValue">
+          <el-input v-model="form.dictValue" placeholder="请输入字典值" />
+        </el-form-item>
+        <el-form-item label="父ID" prop="pid">
+          <el-input v-model="form.pid" placeholder="请输入父ID" />
+        </el-form-item>
+        <el-form-item label="部门ID" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门ID" />
+        </el-form-item>
+        <el-form-item label="排序" prop="dictSort">
+          <el-input v-model="form.dictSort" placeholder="请输入排序" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="TreeDict">
+import { listTreeDict, getTreeDict, delTreeDict, addTreeDict, updateTreeDict } from "@/api/system/treeDict";
+
+const { proxy } = getCurrentInstance();
+
+const treeDictList = ref([]);
+const treeDictOptions = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const title = ref("");
+const isExpandAll = ref(true);
+const refreshTable = ref(true);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    dictText: null,
+    dictValue: null,
+    pid: null,
+    deptId: null,
+    dictSort: null,
+    status: null,
+  },
+  rules: {
+    dictText: [
+      { required: true, message: "字典文本不能为空", trigger: "blur" }
+    ],
+    dictValue: [
+      { required: true, message: "字典值不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询树形字典列表 */
+function getList() {
+  loading.value = true;
+  listTreeDict(queryParams.value).then(response => {
+    treeDictList.value = proxy.handleTree(response.data, "id", "id");
+    loading.value = false;
+  });
+}
+
+/** 查询树形字典下拉树结构 */
+function getTreeselect() {
+  listTreeDict().then(response => {
+    treeDictOptions.value = [];
+    const data = { id: 0, dictText: '顶级节点', children: [] };
+    data.children = proxy.handleTree(response.data, "id", "id");
+    treeDictOptions.value.push(data);
+  });
+}
+	
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    dictText: null,
+    dictValue: null,
+    pid: null,
+    deptId: null,
+    dictSort: null,
+    status: null,
+    remark: null,
+    updateBy: null,
+    updateTime: null,
+    createBy: null,
+    createTime: null
+  };
+  proxy.resetForm("treeDictRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+/** 新增按钮操作 */
+function handleAdd(row) {
+  reset();
+  getTreeselect();
+  if (row != null && row.id) {
+    form.value.id = row.id;
+  } else {
+    form.value.id = 0;
+  }
+  open.value = true;
+  title.value = "添加树形字典";
+}
+
+/** 展开/折叠操作 */
+function toggleExpandAll() {
+  refreshTable.value = false;
+  isExpandAll.value = !isExpandAll.value;
+  nextTick(() => {
+    refreshTable.value = true;
+  });
+}
+
+/** 修改按钮操作 */
+async function handleUpdate(row) {
+  reset();
+  await getTreeselect();
+  if (row != null) {
+    form.value.id = row.id;
+  }
+  getTreeDict(row.id).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改树形字典";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["treeDictRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateTreeDict(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addTreeDict(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  proxy.$modal.confirm('是否确认删除树形字典编号为"' + row.id + '"的数据项？').then(function() {
+    return delTreeDict(row.id);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+getList();
+</script>
diff --git a/vite.config.js b/vite.config.js
index 0567692..fb0c068 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,58 +1,64 @@
-import { defineConfig, loadEnv } from 'vite'
+import {
+	defineConfig,
+	loadEnv
+} from 'vite'
 import path from 'path'
 import createVitePlugins from './vite/plugins'
 
 // https://vitejs.dev/config/
-export default defineConfig(({ mode, command }) => {
-  const env = loadEnv(mode, process.cwd())
-  const { VITE_APP_ENV } = env
-  return {
-    // 部署生产环境和开发环境下的URL。
-    // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
-    // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-    base: VITE_APP_ENV === 'production' ? '/' : '/',
-    plugins: createVitePlugins(env, command === 'build'),
-    resolve: {
-      // https://cn.vitejs.dev/config/#resolve-alias
-      alias: {
-        // 设置路径
-        '~': path.resolve(__dirname, './'),
-        // 设置别名
-        '@': path.resolve(__dirname, './src')
-      },
-      // https://cn.vitejs.dev/config/#resolve-extensions
-      extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
-    },
-    // vite 相关配置
-    server: {
-      port: 80,
-      host: true,
-      open: true,
-      proxy: {
-        // https://cn.vitejs.dev/config/#server-proxy
-        '/dev-api': {
-          target: 'http://localhost:8080',
-          changeOrigin: true,
-          rewrite: (p) => p.replace(/^\/dev-api/, '')
-        }
-      }
-    },
-    //fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
-    css: {
-      postcss: {
-        plugins: [
-          {
-            postcssPlugin: 'internal:charset-removal',
-            AtRule: {
-              charset: (atRule) => {
-                if (atRule.name === 'charset') {
-                  atRule.remove();
-                }
-              }
-            }
-          }
-        ]
-      }
-    }
-  }
-})
+export default defineConfig(({
+	mode,
+	command
+}) => {
+	const env = loadEnv(mode, process.cwd())
+	const {
+		VITE_APP_ENV
+	} = env
+	return {
+		// 部署生产环境和开发环境下的URL。
+		// 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
+		// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
+		base: VITE_APP_ENV === 'production' ? '/' : '/',
+		plugins: createVitePlugins(env, command === 'build'),
+		resolve: {
+			// https://cn.vitejs.dev/config/#resolve-alias
+			alias: {
+				// 设置路径
+				'~': path.resolve(__dirname, './'),
+				// 设置别名
+				'@': path.resolve(__dirname, './src')
+			},
+			// https://cn.vitejs.dev/config/#resolve-extensions
+			extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
+		},
+		// vite 相关配置
+		server: {
+			port: 80,
+			host: true,
+			open: true,
+			proxy: {
+				// https://cn.vitejs.dev/config/#server-proxy
+				'/dev-api': {
+					target: 'http://192.168.3.246:9090',
+					changeOrigin: true,
+					rewrite: (p) => p.replace(/^\/dev-api/, '')
+				}
+			}
+		},
+		//fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
+		css: {
+			postcss: {
+				plugins: [{
+					postcssPlugin: 'internal:charset-removal',
+					AtRule: {
+						charset: (atRule) => {
+							if (atRule.name === 'charset') {
+								atRule.remove();
+							}
+						}
+					}
+				}]
+			}
+		}
+	}
+})
\ No newline at end of file