Procházet zdrojové kódy

功图下行曲线颜色调整,井参数管理增加y轴固定最大最小设置(图形参数)

chenwen před 5 měsíci
rodič
revize
960c45ba4d

+ 1 - 1
src/components/diagram/lib/line.js

@@ -21,7 +21,7 @@ function Line(opts){
 	this.turnIndex=null;
 	this.startUp=true;
 	this.upColor="#0000ff";
-	this.downColor="#00ff00";
+	this.downColor="#ff440c";
 	this.colorAry=[];
 	this.yUpMaxProj=null;
 	this.yDownMaxProj=null;

+ 24 - 3
src/pages/base/WellParamEdit.vue

@@ -120,6 +120,8 @@
 					</el-form-item>
 				</el-col>
 				
+				
+				
 				<el-col :sm="24" :md="12">
 					<el-form-item label="参数类型" prop="paramType">
 					  <el-select v-model="formModel.paramType"  style="width:100%">
@@ -129,6 +131,8 @@
 					</el-form-item>
 				</el-col>
 				
+				
+				
 			</el-row>
 			  
 		    <el-row :gutter="50" v-show="showParam2">
@@ -204,12 +208,27 @@
 					</el-form-item>
 				</el-col>
 				
+				
+				<el-col :sm="24" :md="12">
+					<el-form-item label="y轴最大">
+						<el-input-number v-model="formModel.yaxisMax" :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="序列名(位移)">
 					  <el-input v-model="formModel.serialName2" autocomplete="off" placeholder="请输入序列名"   clearable />
 					</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-row>  
 			 
 			 
@@ -256,7 +275,9 @@
 	  minVal:null,
 	  referData:null,
 	  adjustMode:null,
-	  paramType:null
+	  paramType:null,
+	  yaxisMax:null,
+	  yaxisMin:null
 	})
 	
 	const showParam2=ref(false)
@@ -297,8 +318,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}=props.record
-				Object.assign(formModel,{displayUnit2,insertUnit2,gatherUnit2,displayFormat2,calibrateA2,calibrateB2,calibrateC2,serialName,serialName2})
+				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})
 				
 				changeParamHandle(paramCode)
 			}

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

@@ -33,7 +33,7 @@
 				<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="testTime" label="采样时间" width="160" align="center"/>
+					<el-table-column prop="testTime" label="采样时间" width="160" align="center" fixed/>
 					<el-table-column prop="createTime" label="入库时间" width="160" align="center"/>
 					<el-table-column prop="liquidDepthStatic" label="静液面深度(m)" width="120" align="center"/>
 					<el-table-column prop="liquidDepthStaticConvert" label="折算静深度(m)" width="120" align="center"/>