Browse Source

井、显示模板关联逻辑调整

chenwen 1 year ago
parent
commit
75cb00b8c5
2 changed files with 33 additions and 11 deletions
  1. 1 1
      src/pages/base/OrgEdit.vue
  2. 32 10
      src/pages/base/WellEdit.vue

+ 1 - 1
src/pages/base/OrgEdit.vue

@@ -103,7 +103,7 @@
 	})
 	
 	const loadMultiTemps=()=>{
-		tempAPI.loadTypeAll().then(resp=>{
+		tempAPI.loadTemps('multi').then(resp=>{
 			if(resp.code==0){
 				tempbases.value=resp.data
 			}

+ 32 - 10
src/pages/base/WellEdit.vue

@@ -47,7 +47,7 @@
 					</el-form-item>
 				</el-col>
 				<el-col :sm="24" :md="12" :lg="8">
-					<el-form-item label="巡查模板" prop="patrolStdTemp">
+					<el-form-item label="标准模板" prop="patrolStdTemp">
 						<el-select v-model="formModel.patrolStdTemp" placeholder="选择巡查模板" style="width:100%;">
 							<el-option
 							  v-for="item in tempList"
@@ -75,6 +75,20 @@
 						<el-input-number v-model="formModel.displayNum" :min="1" :max="10000" style="width:100%"/>
 					</el-form-item>
 				</el-col>
+				
+				<el-col :sm="24" :md="12" :lg="8">
+					<el-form-item label="分组曲线模板" prop="patrolGrpcurveTemp">
+						<el-select v-model="formModel.patrolGrpcurveTemp" placeholder="选择巡查模板" style="width:100%;">
+							<el-option
+							  v-for="item in grpTempList"
+							  :key="item.tempId"
+							  :label="item.tempName"
+							  :value="item.tempId"
+							/>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				
 				<el-col :span="24">
 					<el-form-item label="地理位置">
 					  <el-input v-model="formModel.locate" autocomplete="off" placeholder="请输入地理位置" class="edit-form-item" clearable/>
@@ -125,6 +139,7 @@
 	  lat:'',
 	  locate:'',
 	  patrolStdTemp:'',
+	  patrolGrpcurveTemp:'',
 	  orgId:'',
 	  belongOrgName:'',
 	  deviceCode:'',
@@ -140,9 +155,13 @@
 			],
 		patrolStdTemp:[
 			{required:true,message:'巡查标准模板还未选择',trigger:'blur'},
-			]
+			],
+		patrolGrpcurveTemp:[
+			{required:true,message:'巡查分组曲线模板还未选择',trigger:'blur'}
+		]
 	})
 	const tempList=ref([])
+	const grpTempList=ref([])
 	const wellSortOpts=ref([])
 	const wellTypeOpts=ref([])
 	const gatherDevices=ref([])
@@ -152,9 +171,10 @@
 	})
 	
 	const loadLayoutTemps=()=>{
-		tempAPI.loadTempList().then(resp=>{
+		tempAPI.loadMultiTemps('single,singleGroup').then(resp=>{
 			if(resp.code==0){
-				tempList.value=resp.data
+				tempList.value=resp.data.single
+				grpTempList.value=resp.data.singleGroup
 			}
 		}).catch(error=>{
 			console.log(error)
@@ -176,7 +196,7 @@
 			}
 			
 			resp=await stationAPI.loadDevOpts({devType:'gather'})
-			console.log(resp)
+			//console.log(resp)
 			if(resp.code==0&&resp.data){
 				gatherDevices.value=resp.data
 			}
@@ -218,9 +238,9 @@
 		stationAPI.getWell(id).then(resp=>{
 			console.log(resp)
 			if(resp.code==0){
-				let {wellId,wellName,wellSort,wellType,lng,lat,locate,patrolStdTemp,orgId,belongOrgName,deviceCode,displayNum}=resp.data
+				let {wellId,wellName,wellSort,wellType,lng,lat,locate,patrolStdTemp,patrolGrpcurveTemp,orgId,belongOrgName,deviceCode,displayNum}=resp.data
 				
-				Object.assign(formModel,{wellId,wellName,wellSort,wellType,lng,lat,locate,patrolStdTemp,orgId,belongOrgName,deviceCode,displayNum})
+				Object.assign(formModel,{wellId,wellName,wellSort,wellType,lng,lat,locate,patrolStdTemp,patrolGrpcurveTemp,orgId,belongOrgName,deviceCode,displayNum})
 			}
 		}).catch(err=>{
 			console.log('get well err:'+err)
@@ -312,8 +332,8 @@
 	}
 	
 	const clearForm=()=>{
-		let [wellId,wellName,wellSort,wellType,lng,lat,locate,orgId,belongOrgName,gatherDevice,patrolStdTemp,displayNum]=[null,null,null,null,null,null,null,null,null,null,null,1]
-		Object.assign(formModel,{wellId,wellName,wellSort,wellType,lng,lat,locate,orgId,belongOrgName,gatherDevice,patrolStdTemp,displayNum})
+		let [wellId,wellName,wellSort,wellType,lng,lat,locate,orgId,belongOrgName,gatherDevice,patrolStdTemp,patrolGrpcurveTemp,displayNum]=[null,null,null,null,null,null,null,null,null,null,null,null,1]
+		Object.assign(formModel,{wellId,wellName,wellSort,wellType,lng,lat,locate,orgId,belongOrgName,gatherDevice,patrolStdTemp,patrolGrpcurveTemp,displayNum})
 	}
 	
 	
@@ -323,5 +343,7 @@
 	.el-col{
 		height:60px;
 	}
-	
+	.edit-page:deep(.el-form-item__label){
+		width:120px !important;
+	}
 </style>