Browse Source

前端井参数管理增加图形数据x轴最大最小值设置功能,功图绘制增加x轴最大最小值支持

chenwen 5 months ago
parent
commit
13633253c7
2 changed files with 24 additions and 10 deletions
  1. 3 3
      src/components/diagram/lib/diagram.js
  2. 21 7
      src/pages/base/WellParamEdit.vue

+ 3 - 3
src/components/diagram/lib/diagram.js

@@ -119,7 +119,7 @@ Diagram.prototype={
 	setData:function(diagramData){ //add 2023.5.26  
 	//{base:{type:,xTitle:,yTitle:,title,xUnit,yUnit,xyAxisRatio,yFixedMin,yFixedMax},serial:{smpTime,xvals,yvals},descTxt}
 		
-		let {type='GT',xTitle='',yTitle='',title='',xyAxisRatio=2,yFixedMin,yFixedMax,xUnit,yUnit}=diagramData.base||{}
+		let {type='GT',xTitle='',yTitle='',title='',xyAxisRatio=2,yFixedMin,yFixedMax,xFixedMin,xFixedMax,xUnit,yUnit}=diagramData.base||{}
 		let {upMax,downMax,glbMax,glbMin,balance,stroke,turnIndex}=diagramData.base||{}
 		this.xTitle=xTitle
 		this.yTitle=yTitle
@@ -132,8 +132,8 @@ Diagram.prototype={
 		line.initData(diagramData.serial.xvals,diagramData.serial.yvals,{upMax,downMax,glbMax,glbMin,balance,stroke,turnIndex})
 		this.yMax=yFixedMax!=null?yFixedMax:line.yMax;  //优先使用设置的固定值,后使用计算出的值
 		this.yMin=yFixedMin!=null?yFixedMin:line.yMin;
-		this.xMax=line.xMax;
-		this.xMin=0; //最小位移一般固定为0
+		this.xMax=xFixedMax?xFixedMax:line.xMax;
+		this.xMin=xFixedMin?xFixedMin:0; //最小位移一般固定为0
 		this.line=line;
 		
 		//修正xMax

+ 21 - 7
src/pages/base/WellParamEdit.vue

@@ -216,19 +216,31 @@
 				</el-col>
 				
 				<el-col :sm="24" :md="12">
-					<el-form-item label="序列名(位移)">
-					  <el-input v-model="formModel.serialName2" autocomplete="off" placeholder="请输入序列名"   clearable />
+					<el-form-item label="x轴最大">
+						<el-input-number v-model="formModel.xaxisMax" :min="0" :max="10000" :controls="false" style="width:100%" placeholder="图形数据x轴最大"/>
 					</el-form-item>
 				</el-col>
 				
-				
-				
 				<el-col :sm="24" :md="12">
 					<el-form-item label="y轴最小">
 						<el-input-number v-model="formModel.yaxisMin" :min="0" :max="10000" :controls="false" style="width:100%" placeholder="图形数据y轴最小"/>
 					</el-form-item>
 				</el-col>
 				
+				
+				
+				<el-col :sm="24" :md="12">
+					<el-form-item label="x轴最小">
+						<el-input-number v-model="formModel.xaxisMin" :min="0" :max="10000" :controls="false" style="width:100%" placeholder="图形数据x轴最小"/>
+					</el-form-item>
+				</el-col>
+				
+				<el-col :sm="24" :md="12">
+					<el-form-item label="序列名(位移)">
+					  <el-input v-model="formModel.serialName2" autocomplete="off" placeholder="请输入序列名"   clearable />
+					</el-form-item>
+				</el-col>
+				
 			</el-row>  
 			 
 			 
@@ -277,7 +289,9 @@
 	  adjustMode:null,
 	  paramType:null,
 	  yaxisMax:null,
-	  yaxisMin:null
+	  yaxisMin:null,
+	  xaxisMax:null,
+	  xaxisMin:null
 	})
 	
 	const showParam2=ref(false)
@@ -318,8 +332,8 @@
 				let {paramId,wellId,paramCode,paramName,displayUnit,displayFormat,insertUnit,gatherUnit,calibrateA,calibrateB,calibrateC,displayNum,maxVal,minVal,referData,adjustMode,paramType}=props.record
 				Object.assign(formModel,{paramId,wellId,paramCode,paramName,displayUnit,displayFormat,insertUnit,gatherUnit,calibrateA,calibrateB,calibrateC,displayNum,maxVal,minVal,referData,adjustMode,paramType})
 				
-				let {displayUnit2,insertUnit2,gatherUnit2,displayFormat2,calibrateA2,calibrateB2,calibrateC2,serialName,serialName2,yaxisMax,yaxisMin}=props.record
-				Object.assign(formModel,{displayUnit2,insertUnit2,gatherUnit2,displayFormat2,calibrateA2,calibrateB2,calibrateC2,serialName,serialName2,yaxisMax,yaxisMin})
+				let {displayUnit2,insertUnit2,gatherUnit2,displayFormat2,calibrateA2,calibrateB2,calibrateC2,serialName,serialName2,yaxisMax,yaxisMin,xaxisMax,xaxisMin}=props.record
+				Object.assign(formModel,{displayUnit2,insertUnit2,gatherUnit2,displayFormat2,calibrateA2,calibrateB2,calibrateC2,serialName,serialName2,yaxisMax,yaxisMin,xaxisMax,xaxisMin})
 				
 				changeParamHandle(paramCode)
 			}