Browse Source

调整井参数管理,增加字段

chenwen 2 years ago
parent
commit
0089421aee

+ 2 - 3
src/pages/base/ParamMgr.vue

@@ -24,9 +24,8 @@
 			  <template #tabColumns={indexGenerate}>
 				  <el-table-column type="index" :index="indexGenerate" label="序号" width="60" align="center"/>
 				  <el-table-column prop="paramName" label="参数名" width="150" />
-				  <el-table-column prop="paramCode" label="参数编码" width="120" />
-				  <el-table-column prop="paramUnit" label="计量单位" width="120" />
-				  <!-- <el-table-column prop="modifyTime" label="更新时间" width="160" /> -->
+				  <el-table-column prop="paramCode" label="参数编码" width="180" />
+				  
 				  <el-table-column prop="modifyByName" label="修改人" width="100" />
 				  <el-table-column prop="oper" label="操作" width="160" fixed="right">
 				  					<template #default="scope">

+ 3 - 7
src/pages/base/ParamMgrEdit.vue

@@ -10,9 +10,9 @@
 			   <el-input v-model="formModel.paramCode" autocomplete="off" placeholder="请输入参数编码" class="edit-form-item" clearable/>
 			 </el-form-item>
 			 
-			 <el-form-item label="计量单位" prop="paramUnit">
+			<!-- <el-form-item label="计量单位" prop="paramUnit">
 			   <el-input v-model="formModel.paramUnit" autocomplete="off" placeholder="请输入计量单位" class="edit-form-item" clearable/>
-			 </el-form-item>
+			 </el-form-item> -->
 			  
 			 
 			  
@@ -47,11 +47,7 @@
 		paramCode:[
 			{required:true,message:'参数编码还未填写',trigger:'blur'},
 			{ min: 1, max: 32, message: '参数编码长度应该为1-32', trigger: 'blur' }
-			],
-		paramUnit:[
-			{required:true,message:'计量单位还未填写',trigger:'blur'},
-			{ min: 1, max: 32, message: '计量单位长度应该为1-32', trigger: 'blur' }
-			]	
+			]
 	})
 	
 	onMounted(()=>{

+ 9 - 5
src/pages/base/WellParam.vue

@@ -17,10 +17,14 @@
 			  <template #tabColumns={indexGenerate}>
 				  <el-table-column type="index" :index="indexGenerate" label="序号" width="60" align="center"/>
 				  <el-table-column prop="paramName" label="参数名" width="150" />
-				  <el-table-column prop="paramCode" label="参数编码" width="120" />
-				  <el-table-column prop="paramUnit" label="计量单位" width="120" />
-				  <el-table-column prop="unitScale" label="换算比例" width="160" />
-				  <el-table-column prop="format" label="格式化" width="160" />
+				  <el-table-column prop="paramCode" label="参数编码" width="140" />
+				  <el-table-column prop="displayUnit" label="显示单位" width="90" align="center"/>
+				  <el-table-column prop="displayFormat" label="显示格式" width="90" align="center"/>
+				  <el-table-column prop="insertUnit" label="入库单位" width="90" align="center"/>
+				  <el-table-column prop="gatherUnit" label="采集单位" width="90" align="center"/>
+				  <el-table-column prop="calibrateA" label="标定系数A" width="100" align="center"/>
+				  <el-table-column prop="calibrateB" label="标定系数B" width="100" align="center"/>
+				  <el-table-column prop="calibrateC" label="标定系数C" width="100" align="center"/>
 				  
 				  <el-table-column prop="oper" label="操作" width="160" fixed="right">
 				  					<template #default="scope">
@@ -38,7 +42,7 @@
 		</div>
 		
 		
-		<el-dialog v-model="editDialogShow" title="编辑" :close-on-click-modal="false"
+		<el-dialog v-model="editDialogShow" title="数据编辑" :close-on-click-modal="false"
 		:destroy-on-close="true"
 		>
 			<WellParamEdit ref="editWin" :record="crtEditRecord"></WellParamEdit>

+ 91 - 44
src/pages/base/WellParamEdit.vue

@@ -1,33 +1,78 @@
 <template>
 	<div class="edit-page">
-		<el-form :model="formModel" ref="formcomp"  label-position="right" label-width="auto" :inline="false" :rules="rules" :inline-message="true">
-		      
-			  <el-form-item label="参数名" prop="paramName">
-			    <el-input v-model="formModel.paramName" autocomplete="off" placeholder="请输入参数名" class="edit-form-item" clearable/>
-			  </el-form-item>
+		<el-form :model="formModel" ref="formcomp"  label-position="top" label-width="auto" :inline="false" :rules="rules" :inline-message="false">
+		    <el-row :gutter="50">
+				<el-col :sm="24" :md="12">
+					<el-form-item label="参数名" prop="paramName">
+					  <el-input v-model="formModel.paramName" autocomplete="off" placeholder="请输入参数名"  clearable/>
+					</el-form-item>
+				</el-col>
+				
+				<el-col :sm="24" :md="12">
+					<el-form-item label="参数编码" prop="paramCode" >
+									<el-select v-model="formModel.paramCode"  placeholder="选择参数编码"  style="width:100%">
+										<el-option
+									       v-for="item in paramCodeOpts"
+									       :key="item.paramCode"
+									       :label="item.paramName+'【'+item.paramCode+'】'"
+									       :value="item.paramCode"
+									     />
+									</el-select>
+					</el-form-item>
+				</el-col>
+				
+				<el-col :sm="24" :md="12">
+					<el-form-item label="显示单位" prop="displayUnit">
+					  <el-input v-model="formModel.displayUnit" autocomplete="off" placeholder="请输入计量单位"   clearable/>
+					</el-form-item>
+				</el-col>
+				
+				<el-col :sm="24" :md="12">
+					<el-form-item label="显示格式" >
+					  <el-input v-model="formModel.displayFormat" autocomplete="off" placeholder="请输入显示格式"  clearable/>
+					</el-form-item>
+				</el-col>
+				
+				<el-col :sm="24" :md="12">
+					<el-form-item label="入库单位">
+					  <el-input v-model="formModel.insertUnit" autocomplete="off" placeholder="请输入入库单位"   clearable />
+					</el-form-item>
+				</el-col>
+				
+				<el-col :sm="24" :md="12">
+					<el-form-item label="采集单位">
+					  <el-input v-model="formModel.gatherUnit" autocomplete="off" placeholder="请输入采集单位"   clearable />
+					</el-form-item>
+				</el-col>
+				
+				<el-col :sm="24" :md="12">
+					<el-form-item label="标定系数A">
+					  <el-input v-model="formModel.calibrateA" autocomplete="off" placeholder="请输入标定系数A"   clearable />
+					</el-form-item>
+				</el-col>
+				
+				<el-col :sm="24" :md="12">
+					<el-form-item label="标定系数B">
+					  <el-input v-model="formModel.calibrateB" autocomplete="off" placeholder="请输入标定系数B"   clearable />
+					</el-form-item>
+				</el-col>
+				
+				<el-col :sm="24" :md="12">
+					<el-form-item label="标定系数C">
+					  <el-input v-model="formModel.calibrateC" autocomplete="off" placeholder="请输入标定系数C"   clearable />
+					</el-form-item>
+				</el-col>
+				
+			</el-row>
+			  
 		      
-			 <el-form-item label="参数编码" prop="paramCode">
-				<el-select v-model="formModel.paramCode"  placeholder="选择参数编码" class="edit-form-item">
-					<el-option
-				       v-for="item in paramCodeOpts"
-				       :key="item.paramCode"
-				       :label="item.paramCode+'【'+item.paramName+'】'"
-				       :value="item.paramCode"
-				     />
-				</el-select>
-			 </el-form-item>
 			 
-			 <el-form-item label="计量单位" prop="paramUnit">
-			   <el-input v-model="formModel.paramUnit" autocomplete="off" placeholder="请输入计量单位" class="edit-form-item" clearable/>
-			 </el-form-item>
+			 
+			 
 			  
-			 <el-form-item label="换算比例">
-			   <el-input v-model="formModel.unitScale" autocomplete="off" placeholder="请输入换算比例" class="edit-form-item" clearable onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,3})?).*$/g, '$1')"/>
-			 </el-form-item>
 			 
-			 <el-form-item label="格式化" prop="format">
-			   <el-input v-model="formModel.format" autocomplete="off" placeholder="请输入格式化串" class="edit-form-item" clearable/>
-			 </el-form-item>
+			 
+			 
 			  
 			
 		</el-form>
@@ -41,13 +86,17 @@
 	import {ElMessageBox,ElMessage} from 'element-plus'
 	
 	const formModel = reactive({
-	  paramId:'',
-	  wellId:'',
-	  paramName: '',
-	  paramCode:'',
-	  paramUnit:'',
-	  unitScale:null,
-	  format:''
+	  paramId:null,
+	  wellId:null,
+	  paramName: null,
+	  paramCode:null,
+	  displayUnit:null,
+	  displayFormat:null,
+	  insertUnit:null,
+	  gatherUnit:null,
+	  calibrateA:null,
+	  calibrateB:null,
+	  calibrateC:null
 	})
 	
 	const props=defineProps({
@@ -65,21 +114,22 @@
 			{required:true,message:'参数编码还未选择',trigger:'blur'},
 			
 			],
-		paramUnit:[
-			{required:true,message:'计量单位还未填写',trigger:'blur'},
-			{ min: 1, max: 32, message: '计量单位长度应该为1-32', trigger: 'blur' }
+		insertUnit:[
+			{required:true,message:'入库单位还未填写',trigger:'blur'},
+			{ min: 1, max: 32, message: '入库单位长度应该为1-32', trigger: 'blur' }
+			],
+		gatherUnit:[
+			{required:true,message:'采集单位还未填写',trigger:'blur'},
+			{ min: 1, max: 32, message: '采集单位长度应该为1-32', trigger: 'blur' }
 			],
-		format:[
-			{pattern:/^#*0(\.[0#]+)?$/,message: '格式化串不符合规范如:#0.00', trigger: 'blur' }
-		]
 	})
 	
 	onMounted(async ()=>{
 		try{
 			await initForm()
 			if(props.record){
-				let {paramId,wellId,paramCode,paramName,paramUnit,unitScale,format}=props.record
-				Object.assign(formModel,{paramId,wellId,paramCode,paramName,paramUnit,unitScale,format})
+				let {paramId,wellId,paramCode,paramName,displayUnit,displayFormat,insertUnit,gatherUnit,calibrateA,calibrateB,calibrateC}=props.record
+				Object.assign(formModel,{paramId,wellId,paramCode,paramName,displayUnit,displayFormat,insertUnit,gatherUnit,calibrateA,calibrateB,calibrateC})
 			}
 		}
 		catch(err){
@@ -147,11 +197,8 @@
 </script>
 
 <style scoped>
-	/* .el-form--inline.el-form--label-top{
-		justify-content: space-between;
-	} */
-	.edit-form-item{
-		width:260px;
+	.el-col{
+		height:85px;
 	}
 	
 </style>