动液面参数显示调整

src/components/liquidCurve/lib/liquidCurve.js

@@ -282,6 +282,9 @@ LiquidCurve.prototype={
 	},
 	
 	setMarkLinePos(markKey,idx){
+		if(!this.hoopSerial.curve){
+			return
+		}
 		let markline=this[markKey+'Mark']
 		let pos=this.hoopSerial.curve.shape.points[idx]
 		markline.setPosition([pos[0],0])

src/pages/single/Liquid.vue

@@ -25,17 +25,19 @@
 						      />
 						
 					</div>
-					<el-button type="primary" style="margin-left:10px;" @click="editDialogShow=true">远程设置</el-button>
+					<el-button type="primary" style="margin-left:10px;" @click="tabQuery">检索</el-button>
+					<el-button type="warning" style="margin-left:10px;" @click="editDialogShow=true">远程设置</el-button>
 				</template>
 				<template #tabColumns={indexGenerate}>
 					<el-table-column type="index" :index="indexGenerate" label="序号" width="60" align="center" fixed/>
 					<el-table-column prop="wellName" label="井名" width="150" fixed/>
-					<el-table-column prop="liquidDepth" label="液面深度(m)" width="120" align="center"/>
+					<el-table-column prop="liquidDepth" label="校正液面深度(m)" width="140" align="center"/>
 					<el-table-column prop="computeModeName" label="计算方法" width="90" align="center"/>
-					<el-table-column prop="testTime" label="测试时间" width="160" align="center"/>
-					<el-table-column prop="liquidDepthDev" label="液面深度(m设备)" width="160" align="center"/>
-					<el-table-column prop="soundSpeedDev" label="音速(m/s设备)" width="120" align="center"/>
-					<el-table-column prop="casingPressDev" label="套压(MPa设备)" width="120" align="center"/>
+					<el-table-column prop="testTime" label="采样时间" width="160" align="center"/>
+					<el-table-column prop="liquidDepthDev" label="液面深度(m)" width="160" align="center"/>
+					<el-table-column prop="soundSpeedDev" label="设备音速(m/s)" width="120" align="center"/>
+					<el-table-column prop="casingPressDev" label="套压(MPa)" width="120" align="center"/>
+					<el-table-column prop="batteryVoltage" label="电池电压" width="100" align="center"/>
 					<el-table-column prop="oper" label="操作" width="120" fixed="right">
 						<template #default="scope">
 							<div class="tool-column">
@@ -68,9 +70,13 @@
 					<el-form-item label="音速" v-show="toolForm.computeMode=='sound_speed'">
 					  <el-input-number v-model="toolForm.soundSpeed"  :controls="false" placeholder="音速" :min="1" class="tool-input" clearable/><label class="tool-input-unit">(m/s)</label>
 					</el-form-item>
+					<el-form-item label="计算系数" v-show="toolForm.computeMode=='sound_speed'">
+					  <el-input-number v-model="toolForm.soundSpeedFactor"  :controls="false" placeholder="系数"  class="tool-input" clearable/><label class="tool-input-unit"></label>
+					</el-form-item>
+					
 					<el-form-item style="flex:1;">
-						
 					</el-form-item>
+					
 					<el-form-item label="计算深度">
 					  <el-input v-model="toolForm.liquidDepth"  :controls="false" placeholder="深度"  class="tool-input" readonly/><label class="tool-input-unit">(m)</label>
 					</el-form-item>
@@ -131,7 +137,8 @@
 		soundMarkDepth:null,
 		soundSpeed:null,
 		soundInterval:null,
-		liquidDepth:null
+		liquidDepth:null,
+		soundSpeedFactor:1.0
 	})
 	
 	const tabQuery=()=>{
@@ -165,6 +172,10 @@
 			}
 			//console.log(resp.data)
 			utils.copyAttr(resp.data,toolForm)
+			if(toolForm.soundSpeedFactor==null){
+				toolForm.soundSpeedFactor=1.0
+			}
+			
 			let datas={hoopDatas:resp.data.hoopDatas.split(','),liquidDatas:resp.data.liquidDatas.split(',')}
 			let {computeMode,liquidDepth,wellHeadPos,liquidSufacePos,soundMarkPos,hoopStartPos,hoopEndPos}=resp.data
 			datas.initData={computeMode,liquidDepth,wellHeadPos,liquidSufacePos,soundMarkPos,hoopStartPos,hoopEndPos}
@@ -190,7 +201,7 @@
 				ElMessage.error('请正确设置音速')
 				return
 			}
-			depth=toolForm.soundSpeed*offset*(toolForm.soundInterval||0.0045)*0.5
+			depth=toolForm.soundSpeedFactor*toolForm.soundSpeed*offset*(toolForm.soundInterval||0.0045)*0.5
 			
 		}
 		else if(calMode=="sound_mark"){
@@ -234,7 +245,8 @@
 	
 	const computeModeChange=(val)=>{
 		toolForm.liquidDepth=null
-		liquidCurve.value.setInitData(toolForm)
+		setTimeout(()=>{liquidCurve.value.setInitData(toolForm)},1)
+		
 	}
 	
 	const saveLiquid=()=>{