Parcourir la source

深度压差 调整为 深度差

chenwen il y a 1 an
Parent
commit
ab86fc17c7

+ 8 - 4
src/pages/analysis/IPR.vue

@@ -24,7 +24,7 @@
 				  <el-table-column type="selection" width="55" :reserve-selection="true"/>
 				  <el-table-column prop="depthDiff"  width="110" align="center">
 					  <template #header>
-					      深度差<br>(m)
+					      深度差<br>(m)
 					  </template>
 					  <template #default="scope">
 					  	<el-input-number v-model="scope.row.depthDiff" :controls="false" :precision="2" @change="recordChangeHandler(scope.row)"/>
@@ -80,7 +80,7 @@
 				<div class="ipr-header">
 					<el-select v-model="regressionConfig.ySort" style="margin-right:10px;width:100px;" @change="drawCurve">
 						<el-option label="流动压差" value="flow"/>
-						<el-option label="深度差" value="depth"/>
+						<el-option label="深度差" value="depth"/>
 					</el-select>
 					<el-select v-model="regressionConfig.order" style="margin-right:10px;width:100px;" @change="drawCurve">
 						<el-option label="1阶回归" :value="1"/>
@@ -284,7 +284,11 @@
 			ElMessage.error('请在左侧至少选择5条数据再继续')
 			return
 		}
+		
+		
 		let pressKey=regressionConfig.ySort=='depth'?'depthDiff':'flowPressDiff'
+		regressionConfig.yUnit=regressionConfig.ySort=='depth'?'深度差(m)':'流动压差(KPa)'
+		
 		drawSerials=[{name:'液量',datas:[]},{name:'油量',datas:[]},{name:'水量',datas:[]}]
 		selectedds.forEach(ds=>{
 			if(ds.liquidYield!=null){
@@ -298,13 +302,13 @@
 			}
 		})
 		
-		regressionConfig.yUnit=regressionConfig.ySort=='depth'?'深度压差(m)':'流动压差(KPa)'
+		
 		iprComp.value.draw(drawSerials,regressionConfig)
 	}
 	/*回归曲线绘制-end*/
 	
 	const saveRegressRst=()=>{
-		let saveData={wellId:queryForm.wellId}
+		let saveData={wellId:queryForm.wellId,pressSort:regressionConfig.ySort}
 		drawSerials.forEach(itm=>{
 			if(itm.name=='液量'){
 				saveData['liquidExpression']=itm.regression.expression

+ 1 - 1
src/pages/single/LiquidSelect.vue

@@ -31,7 +31,7 @@
 			<template #tabColumns={indexGenerate}>
 				<el-table-column type="selection" width="55" :reserve-selection="true"/>
 				<!-- <el-table-column type="index" :index="indexGenerate" label="序号" width="60" align="center" fixed/> -->
-				<el-table-column prop="depthDiff" label="深度差(m)" width="140" align="center"/>
+				<el-table-column prop="depthDiff" label="深度差(m)" width="140" align="center"/>
 				<el-table-column prop="flowPressDiff" label="流动压差(KPa)" width="140" align="center"/>
 				<el-table-column prop="liquidDepthConvert" label="折算液面深度(m)" width="140" align="center"/>
 				<el-table-column prop="liquidDepthStaticConvert" label="折算静深度(m)" width="140" align="center"/>

+ 3 - 0
src/pages/single/WellProduceParam.vue

@@ -84,6 +84,9 @@
 		    </div>
 		  </template>
 			<div class="flex-card-body">
+				<div class="param-block regression-block" style="width:140px;">
+					{{ {depth:'深度差回归',flow:'流动压差回归'}[regression?.pressSort] }}
+				</div>
 				<div class="param-block regression-block">
 					<div class="param-tit">液量回归</div>
 					<div>{{regression?.liquidExpression}}</div>

+ 5 - 0
src/pages/single/WellRegressionHis.vue

@@ -30,6 +30,11 @@
 			  <template #tabColumns={indexGenerate}>
 				  <el-table-column type="index" :index="indexGenerate" label="序号" width="60" align="center" fixed/>
 				  <el-table-column prop="createTime" label="创建时间" width="160"  fixed/>
+				  <el-table-column prop="pressSort" label="压差" width="90">
+					  <template #default="scope">
+						  {{{depth:'深度差',flow:'流动压差'}[scope.row.pressSort]}}
+					  </template>
+				  </el-table-column>
 				  <el-table-column prop="liquidExpression" label="液量回归方程" width="240" />
 				  <el-table-column prop="oilExpression" label="油量回归方程" width="240" />
 				  <el-table-column prop="waterExpression" label="水量回归方程" width="240" />