完善井采集参数单位设置，及换算功能

src/api/wellParam.js

@@ -24,4 +24,10 @@ api.del = (data) => {
 	    });
 }
 
+api.loadUnitOpts = ()=>{
+	return request({
+	    url: '/base/unit/loadAll',
+	});
+}
+
 export  default api

src/pages/base/UnitMgr.vue

@@ -27,7 +27,7 @@
 				  <el-table-column prop="unitName" label="名称" width="160" />
 				  <el-table-column prop="baseUnit" label="基准单位" width="160" />
 				  <el-table-column prop="baseScale" label="比例" width="160" />
-				  <el-table-column prop="unitGroup" label="分组" width="160" />
+				  <!-- <el-table-column prop="unitGroup" label="分组" width="160" /> -->
 				  <el-table-column prop="oper" label="操作" width="160" fixed="right">
 				  					<template #default="scope">
 				  						<div class="tool-column">

src/pages/base/WellParam.vue

@@ -2,7 +2,7 @@
 	<div class="qpage">
 		
 		
-		<div class="qpage-body">
+		<div class="qpage-body" style="height: calc(100vh - 200px);">
 			<CrudTable 
 			ref="crudTable"
 			page-info-opts=""
@@ -12,16 +12,19 @@
 			>
 			  <template #toolGroup>
 				  <el-button type="primary" icon="plus" @click="openEditHandle()">新增</el-button>
+				  <el-button type="warning" icon="Share">同步到采集</el-button>
 				 
 			  </template>
 			  <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="160" />
+				  <el-table-column type="index" :index="indexGenerate" label="序号" width="60" align="center" fixed/>
+				  <el-table-column prop="paramName" label="参数名" width="150" fixed/>
+				  <el-table-column prop="paramCode" label="参数编码" width="160"  fixed/>
 				  <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="disInsScale" label="显示入库比例" width="120" align="center"/>
+				  <el-table-column prop="gatInsScale" label="采集入库比例" width="120" 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"/>

src/pages/base/WellParamEdit.vue

@@ -23,7 +23,14 @@
 				
 				<el-col :sm="24" :md="12">
 					<el-form-item label="显示单位" prop="displayUnit">
-					  <el-input v-model="formModel.displayUnit" autocomplete="off" placeholder="请输入计量单位"   clearable/>
+						<el-select v-model="formModel.displayUnit"  placeholder="请选择显示单位"  style="width:100%">
+							<el-option
+						       v-for="item in unitOpts"
+						       :key="item.unitSymbol"
+						       :label="item.unitSymbol"
+						       :value="item.unitSymbol"
+						     />
+						</el-select>
 					</el-form-item>
 				</el-col>
 				
@@ -34,14 +41,28 @@
 				</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 label="入库单位" prop="insertUnit">
+						<el-select v-model="formModel.insertUnit"  placeholder="请选择入库单位"  style="width:100%">
+							<el-option
+						       v-for="item in unitOpts"
+						       :key="item.unitSymbol"
+						       :label="item.unitSymbol"
+						       :value="item.unitSymbol"
+						     />
+						</el-select>
 					</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 label="采集单位" prop="gatherUnit">
+						<el-select v-model="formModel.gatherUnit"  placeholder="请选择采集单位"  style="width:100%">
+							<el-option
+						       v-for="item in unitOpts"
+						       :key="item.unitSymbol"
+						       :label="item.unitSymbol"
+						       :value="item.unitSymbol"
+						     />
+						</el-select>
 					</el-form-item>
 				</el-col>
 				
@@ -113,14 +134,15 @@
 		paramCode:[
 			{required:true,message:'参数编码还未选择',trigger:'blur'},
 			
+			],
+		displayUnit:[
+			{required:true,message:'显示单位还未填写',trigger:'blur'}
 			],
 		insertUnit:[
-			{required:true,message:'入库单位还未填写',trigger:'blur'},
-			{ min: 1, max: 32, message: '入库单位长度应该为1-32', trigger: 'blur' }
+			{required:true,message:'入库单位还未填写',trigger:'blur'}
 			],
 		gatherUnit:[
-			{required:true,message:'采集单位还未填写',trigger:'blur'},
-			{ min: 1, max: 32, message: '采集单位长度应该为1-32', trigger: 'blur' }
+			{required:true,message:'采集单位还未填写',trigger:'blur'}
 			],
 	})
 	
@@ -143,13 +165,21 @@
 	
 	const paramCodeOpts=ref([])
 	
+	const unitOpts=ref([])
+	
 	const initForm=async ()=>{
 		try{
 			let resp=await paramMgrAPI.loadAll()
-			if(resp.code!=0){
-				return
+			if(resp.code==0){
+				paramCodeOpts.value=resp.data
+			}
+			
+			resp=await wellParamAPI.loadUnitOpts()
+			if(resp.code==0){
+				unitOpts.value=resp.data
 			}
-			paramCodeOpts.value=resp.data
+			
+			
 			initFormDone=true
 			
 			return Promise.resolve('ok')