完善井的编辑，增加井和设备的绑定功能

src/api/station.js

@@ -45,7 +45,7 @@ api.saveWell = (data) => {
 	    return request({
 	        url: '/well/update',
 	        method: 'post',
-			params:  data
+			data:  data
 	    });
 }
 	
@@ -53,7 +53,7 @@ api.addWell = (data) => {
 	    return request({
 	        url: '/well/add',
 	        method: 'post',
-			params:  data
+			data:  data
 	    });
 }
 	
@@ -73,6 +73,15 @@ api.loadSortCode = (data) => {
 	    });
 }
 
+api.loadDevOpts = (data) => {
+	    return request({
+	        url: '/base/device/loadByType',
+	        method: 'post',
+			params:  data
+	    });
+}
+
+
 api.getWell = (wellId)=>{
 	return request({
 	    url: '/well/get',

src/pages/base/DeviceMgr.vue

@@ -25,7 +25,7 @@
 				  <el-table-column type="index" :index="indexGenerate" label="序号" width="60" align="center"/>
 				  <el-table-column prop="deviceCode" label="编号" width="120" />
 				  <el-table-column prop="deviceName" label="设备名" width="160" />
-				  <el-table-column prop="deviceType" label="设备类型" width="160" />
+				  <el-table-column prop="deviceTypeName" label="设备类型" width="160" />
 				  <el-table-column prop="deviceModel" label="规格型号" width="160" />
 				  <el-table-column prop="factory" label="厂家" width="120" />
 				  <el-table-column prop="serialNum" label="设备序号" width="120" />

src/pages/base/DeviceMgrEdit.vue

@@ -34,7 +34,11 @@
 				
 				<el-col :sm="24" :md="12">
 					<el-form-item label="设备类型">
-					  <el-input v-model="formModel.deviceType" autocomplete="off" placeholder="请输入设备类型" clearable/>
+					  <el-select v-model="formModel.deviceType" placeholder="请选择设备类型" style="width:100%">
+					      <el-option label="采集设备" value="gather"/>
+						  <el-option label="主控仪" value="mainctr"/>
+						  <el-option label="动液面设备" value="liquid"/>
+					  </el-select>
 					</el-form-item>
 				</el-col>
 				

src/pages/base/WellEdit.vue

@@ -53,8 +53,7 @@
 				</el-col>
 				<el-col :sm="24" :md="12" :lg="8">
 					<el-form-item label="采集设备">
-						<el-select v-model="formModel.gatherDevice" placeholder="请选择采集设备" style="width:100%;"
-						      multiple
+						<el-select v-model="formModel.deviceCode" placeholder="请选择采集设备" style="width:100%;"
 						      collapse-tags
 						      collapse-tags-tooltip
 							  clearable 
@@ -120,7 +119,7 @@
 	  patrolStdTemp:'',
 	  orgId:'',
 	  belongOrgName:'',
-	  gatherDevice:'',
+	  deviceCode:'',
 	  displayNum:1
 	})
 	
@@ -148,12 +147,18 @@
 		
 		try{
 			let resp=await stationAPI.loadSortCode({superIds})
-			if(resp.code!=0){
-				return
+			if(resp.code==0){
+				for(let sort in resp.data){
+					codeMap[sort].value=resp.data[sort]
+				}
 			}
-			for(let sort in resp.data){
-				codeMap[sort].value=resp.data[sort]
+			
+			resp=await stationAPI.loadDevOpts({devType:'gather'})
+			console.log(resp)
+			if(resp.code==0&&resp.data){
+				gatherDevices.value=resp.data
 			}
+			
 			initFormDone=true
 			
 			return Promise.resolve('ok')
@@ -191,9 +196,9 @@
 		stationAPI.getWell(id).then(resp=>{
 			console.log(resp)
 			if(resp.code==0){
-				let {wellId,wellName,wellSort,wellType,lng,lat,locate,patrolStdTemp,orgId,belongOrgName,gatherDevice,displayNum}=resp.data
+				let {wellId,wellName,wellSort,wellType,lng,lat,locate,patrolStdTemp,orgId,belongOrgName,deviceCode,displayNum}=resp.data
 				
-				Object.assign(formModel,{wellId,wellName,wellSort,wellType,lng,lat,locate,patrolStdTemp,orgId,belongOrgName,gatherDevice,displayNum})
+				Object.assign(formModel,{wellId,wellName,wellSort,wellType,lng,lat,locate,patrolStdTemp,orgId,belongOrgName,deviceCode,displayNum})
 			}
 		}).catch(err=>{
 			console.log('get well err:'+err)

src/pages/base/WellParam.vue

@@ -17,7 +17,7 @@
 			  <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="140" />
+				  <el-table-column prop="paramCode" label="参数编码" width="160" />
 				  <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"/>