增加超声波测液位的页面

src/api/ngtools/NGCalcTools.js

@@ -22,5 +22,17 @@ export function calcFlow(data) {
     }
   })
 }
+// 页面深度计算
+export function calcWaterDeep(data) {
+  return request({
+    url: '/WaterDeepCalc/calculatedepth',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
  
  

src/components/NGTools/meterPar.vue

@@ -1,19 +1,26 @@
 <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 :model="meterPar" ref="dataForm" label-position="top" size="small" :inline="true" label-width="160px"
-			<el-form-item v-if="['0', '1', '2', '3'].includes(meterPar.dMeterType)" :style="{ width: selectWidth + 'px' }" label="流量计类别" prop="dMeterType">
+			class="flex-form">
-				<el-select :key="'meter-type-' + meterPar.dMeterType" v-model="meterPar.dMeterType" placeholder="请选择流量计类别 " clearable>
+			<el-form-item v-if="['0', '1', '2', '3'].includes(meterPar.dMeterType)"
-					<el-option v-for="dict in ngtools_lljlx" :key="dict.value" :label="dict.label" :value="dict.value" />
+				: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-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-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-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">
@@ -22,64 +29,57 @@
 				</el-select>
 			</el-form-item>
 
-			<el-form-item v-if="meterPar.dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="节流装置类型" prop="dCoreType">
+			<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-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-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-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-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-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">
+			<el-form-item v-if="meterPar.dMeterType === '0' || meterPar.dMeterType === '3'"
-				<unit-converter
+				:style="{ width: selectWidth + 'px' }" label="管道内径" prop="dPipeD">
-					v-model="meterPar.dPipeD"
+				<unit-converter v-model="meterPar.dPipeD" :unit-type="'length'" v-model:unit-order="meterPar.dLenUnit"
-					:unit-type="'length'"
+					:show-english-only="false" :decimal-places="5" :width="selectWidth" />
-					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">
+			<el-form-item v-if="meterPar.dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="孔板孔径"
-				<unit-converter
+				prop="dOrificeD">
-					v-model="meterPar.dOrificeD"
+				<unit-converter v-model="meterPar.dOrificeD" :unit-type="'length'"
-					:unit-type="'length'"
+					v-model:unit-order="meterPar.dOrificeUnit" :show-english-only="false" :decimal-places="5"
-					v-model:unit-order="meterPar.dOrificeUnit"
+					:width="selectWidth" />
-					: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">
+			<el-form-item v-if="meterPar.dMeterType === '3'" :style="{ width: selectWidth + 'px' }" label="喉部直径"
-				<unit-converter
+				prop="dOrificeD">
-					v-model="meterPar.dOrificeD"
+				<unit-converter v-model="meterPar.dOrificeD" :unit-type="'length'"
-					:unit-type="'length'"
+					v-model:unit-order="meterPar.dOrificeUnit" :show-english-only="false" :decimal-places="5"
-					v-model:unit-order="meterPar.dOrificeUnit"
+					:width="selectWidth" />
-					:show-english-only="false"
-					:decimal-places="5"
-					:width="selectWidth"
-				/>
 			</el-form-item>
 
 			<el-form-item :style="{ width: selectWidth + 'px' }" label="压力类型" prop="dPfType">
@@ -87,183 +87,145 @@
 					<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">
+			<el-form-item v-if="meterPar.dPfType === '0'" :style="{ width: selectWidth + 'px' }" label="当地大气压"
-				<unit-converter
+				prop="dPatm">
-					v-model="meterPar.dPatm"
+				<unit-converter v-model="meterPar.dPatm" :unit-type="'pressure'" v-model:unit-order="meterPar.dPatmUnit"
-					:unit-type="'pressure'"
+					:show-english-only="false" :decimal-places="6" :width="selectWidth" />
-					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
+				<unit-converter v-model="meterPar.dPf" :unit-type="'pressure'" v-model:unit-order="meterPar.dPfUnit"
-					v-model="meterPar.dPf"
+					:show-english-only="false" :decimal-places="5" :width="selectWidth" />
-					: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
+				<unit-converter v-model="meterPar.dTf" :unit-type="'temperature'" v-model:unit-order="meterPar.dTfUnit"
-					v-model="meterPar.dTf"
+					:show-english-only="false" :decimal-places="5" :width="selectWidth" />
-					: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">
+			<el-form-item v-if="meterPar.dMeterType === '0'" :style="{ width: selectWidth + 'px' }" label="输入差压"
-				<unit-converter
+				prop="dDp">
-					v-model="meterPar.dDp"
+				<unit-converter v-model="meterPar.dDp" :unit-type="'pressure'" v-model:unit-order="meterPar.dDpUnit"
-					:unit-type="'pressure'"
+					:show-english-only="false" :decimal-places="5" :width="selectWidth" />
-					v-model:unit-order="meterPar.dDpUnit"
-					: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="dCd">
+			<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 v-if="meterPar.dMeterType === '1' || meterPar.dMeterType === '2'" :style="{ width: selectWidth + 'px' }" label="仪表系数" prop="dMeterFactor">
+			<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">
+			<el-form-item v-if="meterPar.dMeterType === '1' || meterPar.dMeterType === '2'"
-				<unit-converter
+				:style="{ width: selectWidth + 'px' }" label="脉冲数" prop="dPulseNum">
-					v-model="meterPar.dPulseNum"
+				<unit-converter v-model="meterPar.dPulseNum" :unit-type="'user'" v-model:unit-order="meterPar.dVGscUnit"
-					:unit-type="'user'"
+					:show-english-only="false" :decimal-places="5" :user-defined="true" :user-definedunit-name="'个'"
-					v-model:unit-order="meterPar.dVGscUnit"
+					:enable-convert="false" :width="selectWidth" />
-					: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 === '8'" :style="{ width: selectWidth + 'px' }" label="管束车容积" prop="dVGsc">
+			<el-form-item v-if="meterPar.dMeterType === '8'" :style="{ width: selectWidth + 'px' }" label="管束车容积"
-				<unit-converter
+				prop="dVGsc">
-					v-model="meterPar.dVGsc"
+				<unit-converter v-model="meterPar.dVGsc" :unit-type="'volume'" v-model:unit-order="meterPar.dVGscUnit"
-					:unit-type="'volume'"
+					:show-english-only="false" :decimal-places="5" :width="selectWidth" />
-					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">
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="最大体积流量"
-				<unit-converter
+				prop="dVFlowMax">
-					v-model="meterPar.dVFlowMax"
+				<unit-converter v-model="meterPar.dVFlowMax" :unit-type="'volumeflow'"
-					:unit-type="'volumeflow'"
+					v-model:unit-order="meterPar.dVFlowUnit" :show-english-only="false" :decimal-places="5"
-					v-model:unit-order="meterPar.dVFlowUnit"
+					:width="selectWidth" />
-					: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">
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="最小体积流量"
-				<unit-converter
+				prop="dVFlowMin">
-					v-model="meterPar.dVFlowMin"
+				<unit-converter v-model="meterPar.dVFlowMin" :unit-type="'volumeflow'"
-					:unit-type="'volumeflow'"
+					v-model:unit-order="meterPar.dVFlowUnit" :show-english-only="false" :decimal-places="5"
-					v-model:unit-order="meterPar.dVFlowUnit"
+					:width="selectWidth" />
-					: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">
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="常用流量"
-				<unit-converter
+				prop="dVFlowCon">
-					v-model="meterPar.dVFlowCon"
+				<unit-converter v-model="meterPar.dVFlowCon" :unit-type="'volumeflow'"
-					:unit-type="'volumeflow'"
+					v-model:unit-order="meterPar.dVFlowUnit" :show-english-only="false" :decimal-places="5"
-					v-model:unit-order="meterPar.dVFlowUnit"
+					:enable-convert="true" :width="selectWidth" />
-					: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">
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="压力量程下限"
-				<unit-converter
+				prop="dPfRangeMin">
-					v-model="meterPar.dPfRangeMin"
+				<unit-converter v-model="meterPar.dPfRangeMin" :unit-type="'pressure'"
-					:unit-type="'pressure'"
+					v-model:unit-order="meterPar.dPfUnit" :show-english-only="false" :decimal-places="5"
-					v-model:unit-order="meterPar.dPfUnit"
+					:width="selectWidth" />
-					: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">
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="压力量程上限"
-				<unit-converter
+				prop="dPfRangeMax">
-					v-model="meterPar.dPfRangeMax"
+				<unit-converter v-model="meterPar.dPfRangeMax" :unit-type="'pressure'"
-					:unit-type="'pressure'"
+					v-model:unit-order="meterPar.dPfUnit" :show-english-only="false" :decimal-places="5"
-					v-model:unit-order="meterPar.dPfUnit"
+					:width="selectWidth" />
-					: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">
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="差压量程下限"
-				<unit-converter
+				prop="dDpRangeMin">
-					v-model="meterPar.dDpRangeMin"
+				<unit-converter v-model="meterPar.dDpRangeMin" :unit-type="'pressure'"
-					:unit-type="'pressure'"
+					v-model:unit-order="meterPar.dDpUnit" :show-english-only="false" :decimal-places="5"
-					v-model:unit-order="meterPar.dDpUnit"
+					:width="selectWidth" />
-					: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">
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="差压量程上限"
-				<unit-converter
+				prop="dDpRangeMax">
-					v-model="meterPar.dDpRangeMax"
+				<unit-converter v-model="meterPar.dDpRangeMax" :unit-type="'pressure'"
-					:unit-type="'pressure'"
+					v-model:unit-order="meterPar.dDpUnit" :show-english-only="false" :decimal-places="5"
-					v-model:unit-order="meterPar.dDpUnit"
+					:width="selectWidth" />
-					: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">
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="温度计量程下限"
-				<unit-converter
+				prop="dTfRangeMin">
-					v-model="meterPar.dTfRangeMin"
+				<unit-converter v-model="meterPar.dTfRangeMin" :unit-type="'temperature'"
-					:unit-type="'temperature'"
+					v-model:unit-order="meterPar.dTfUnit" :show-english-only="false" :decimal-places="5"
-					v-model:unit-order="meterPar.dTfUnit"
+					:width="selectWidth" />
-					: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">
+			<el-form-item v-if="meterPar.dBqdd === '1'" :style="{ width: selectWidth + 'px' }" label="温度计量程上限"
-				<unit-converter
+				prop="dTfRangeMax">
-					v-model="meterPar.dTfRangeMax"
+				<unit-converter v-model="meterPar.dTfRangeMax" :unit-type="'temperature'"
-					:unit-type="'temperature'"
+					v-model:unit-order="meterPar.dTfUnit" :show-english-only="false" :decimal-places="5"
-					v-model:unit-order="meterPar.dTfUnit"
+					:width="selectWidth" />
-					:show-english-only="false"
-					:decimal-places="5"
-					:width="selectWidth"
-				/>
 			</el-form-item>
+			<!-- 液面深度计算 -->
+			<el-form-item v-if="meterPar.dMeterType === '20'" :style="{ width: selectWidth + 'px' }" label="常温层深度"
+				prop="dVFlowMax">
+				<unit-converter v-model="meterPar.dVFlowMax" :unit-type="'length'"
+					v-model:unit-order="meterPar.dVFlowUnit" :show-english-only="false" :decimal-places="5"
+					:width="selectWidth" />
+			</el-form-item>
+			<el-form-item v-if="meterPar.dMeterType === '20'" :style="{ width: selectWidth + 'px' }" label="测量时间"
+				prop="dVFlowMin">
+
+				<unit-converter v-model="meterPar.dVFlowMin" :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 === '20'" :style="{ width: selectWidth + 'px' }" label="地温梯度"
+				prop="dVFlowCon">
+				<unit-converter v-model="meterPar.dVFlowCon" :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>
 	</div>
 </template>
 <script setup>
-import { ref, watch, onMounted, inject } from 'vue'; 
+	import {
+		ref,
+		watch,
+		onMounted,
+		inject
+	} from 'vue';
 	import unitConverter from '@/components/inputValueUnit/index';
 
 	// 定义组件名称
 	const __name = 'meterParComponents';
 
 	// 1. 导入 useDict（确保路径正确）
-import { useDict } from '@/utils/dict'; 
+	import {
+		useDict
+	} from '@/utils/dict';
 	// 2. 调用 useDict 获取字典（返回的是 Ref 对象集合）
 	const dictRefs = useDict(
 		'ngtools_cbtj',
@@ -279,7 +241,9 @@ const dictRefs = useDict(
 	);
 
 	// 3. 解构出每个字典的 Ref 对象，并通过 computed 简化 .value 取值（可选，但更优雅）
-import { computed } from 'vue';
+	import {
+		computed
+	} from 'vue';
 	const ngtools_cbtj = computed(() => dictRefs.ngtools_cbtj.value || []);
 	const ngtools_jlzzlx = computed(() => dictRefs.ngtools_jlzzlx.value || []);
 	const ngtools_lljlx = computed(() => dictRefs.ngtools_lljlx.value || []);
@@ -437,8 +401,9 @@ watch(
 				console.log('Emit to parent', newVal);
 				emits('update:modelValue', deepClone(newVal));
 			}
-	},
+		}, {
-	{ deep: true }
+			deep: true
+		}
 	);
 
 	// 对 elFormWidth 进行监听
@@ -446,8 +411,9 @@ watch(
 		() => props.elFormWidth,
 		(newVal) => {
 			selectWidth.value = newVal;
-	},
+		}, {
-	{ deep: true }
+			deep: true
+		}
 	);
 
 	// 对 value 进行深度监听
@@ -461,8 +427,10 @@ watch(
 					dMeterType: String(newVal.dMeterType) // 强制类型转换
 				});
 			}
-	},
+		}, {
-	{ deep: true, immediate: true }
+			deep: true,
+			immediate: true
+		}
 	);
 </script>
 
@@ -470,6 +438,7 @@ watch(
 	.app-container {
 		height: 100%;
 	}
+
 	.flex-form {
 		display: grid;
 		grid-template-columns: repeat(auto-fit, minmax(min(200px, 100%), 1fr));

src/layout/components/Sidebar/SidebarItem.vue

@@ -36,6 +36,7 @@ function hasOneShowingChild(children: RouteItem[] = [], parent: RouteItem) {
 };
 
 function resolvePath(routePath: string, routeQuery?: any) {
+	console.log(routeQuery);
   if (isExternal(routePath)) return routePath
   if (isExternal(props.basePath!)) return props.basePath
 

src/views/ngtools/FlowCal/index.vue

@@ -13,8 +13,10 @@
 				<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" />
+				<meterResult v-if="['0', '1', '2', '3'].includes(dMeterType)" :d-meter-type="dMeterType"
-				<NGResult v-if="['4', '5', '6', '7'].includes(dMeterType)" :d-meter-type="dMeterType" v-model="parentNGResult" :el-form-width="elFormItemWidthmin"></NGResult>
+					v-model="parentMeterResult" :el-form-width="elFormItemWidth" />
+				<NGResult v-if="['4', '5', '6', '7','20'].includes(dMeterType)" :d-meter-type="dMeterType"
+					v-model="parentNGResult" :el-form-width="elFormItemWidthmin"></NGResult>
 			</el-tab-pane>
 		</el-tabs>
 
@@ -23,13 +25,24 @@
 </template>
 
 <script setup>
-import { ref, onMounted, onBeforeMount, watch } from 'vue';
+	import {
-import { useRoute } from 'vue-router';
+		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';
+	import {
+		calcNGPar,
+		calcFlow,
+		calcWaterDeep
+	} from '@/api/ngtools/NGCalcTools.js';
 
 	// 定义响应式数据
 	const btnText = ref('');
@@ -81,9 +94,9 @@ const parentMeterPar = ref({
 		dCdCalMethod: 0,
 		dMeterFactor: 2354,
 		dPulseNum: 12000,
-	dVFlowMax: 6,
+		dVFlowMax: 50,
-	dVFlowMin: 3,
+		dVFlowMin: 8,
-	dVFlowCon: 5,
+		dVFlowCon: 0.025,
 		dPfRangeMin: 0,
 		dPfRangeMax: 0,
 		dDpRangeMin: 0,
@@ -199,6 +212,8 @@ watch(dMeterType, (newValue) => {
 			btnText.value = '计算发热量';
 		} else if (newValue === '7') {
 			btnText.value = '计算其他参数';
+		} else if (newValue === '20') {
+			btnText.value = '计算井下页面深度';
 		}
 		parentMeterPar.value.dMeterType = newValue;
 		console.log('dMeterType 变化后，parentMeterPar:', parentMeterPar.value);
@@ -216,9 +231,12 @@ const showMessage = () => {
 	const btnCalc = () => {
 		if (['0', '1', '2', '3'].includes(dMeterType.value)) {
 			calcBtnFlow();
-	} else if (['4', '5', '6', '7'].includes(dMeterType.value)) {
+		} else if (['4', '5', '6', '7', ].includes(dMeterType.value)) {
 			calc();
 		}
+		else if ([ '20'].includes(dMeterType.value)) {
+			calcBtnWaterDeep();
+		}
 	};
 
 
@@ -239,6 +257,8 @@ const calc = async () => {
 			}
 		}
 		try {
+			console.log(parentMeterPar.value)
+			console.log(dMeterType.value)
 			const res = await calcNGPar(parentMeterPar.value);	 
 			parentNGResult.value = res.data;
 			activeTab.value = 'meterresult';
@@ -248,6 +268,35 @@ const calc = async () => {
 		}
 	};
 
+// 液面深度
+	const calcBtnWaterDeep = 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 {
+			console.log(parentMeterPar.value)
+			console.log(dMeterType.value)
+			const res  = await calcWaterDeep(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);

vite.config.js

@@ -31,7 +31,8 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
-          target: 'http://ngtools.cn:9999',
+  
+		  target: 'http://192.168.3.19:9999',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },