Преглед на файлове

增加单井生产动态模板编辑器、单井巡查混合模式调整生产动态数据、模板的获取

chenwen преди 1 година
родител
ревизия
1ff8b562d0
променени са 3 файла, в които са добавени 50 реда и са изтрити 7 реда
  1. 16 0
      src/api/wellPatrol.js
  2. 3 2
      src/pages/base/WellDynParamTemp.vue
  3. 31 5
      src/pages/single/WellPatrolMix.vue

+ 16 - 0
src/api/wellPatrol.js

@@ -18,6 +18,14 @@ api.loadData=(wellId)=>{
 	});
 }
 
+api.loadDynParamData=(wellId)=>{
+	return request({
+	    url: '/singlepatrol/loadDynParamData',
+	    method: 'post',
+		data:  {wellId}
+	});
+}
+
 api.loadDiagram=(reqData)=>{
 	return request({
 	    url: '/diagram/getDrawData',
@@ -73,6 +81,14 @@ api.loadGrpCurveData=(wellId,paramCode,startDate,endDate)=>{
 	});
 }
 
+api.loadWellDynParamTemp=(wellId)=>{
+	return request({
+	    url: '/singlepatrol/getTempByType',
+	    method: 'post',
+		data:  {wellId,tempType:'singleDynParam'}
+	});
+}
+
 api.modeMenus=[
 		{
 			title:'标准模式',

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

@@ -32,7 +32,7 @@
 	<div class="temp-container">
 		<div class="param-block" :class="{'param-block-active':selectIndex==index}" v-for="(param,index) in tableHead" @click="selectIndex=index">
 			<div class="param-tit">{{param.paramName}}</div>
-			<div class="param-val" ></div>
+			<div class="param-val" >{{param.paramUnit}}</div>
 		</div>
 	</div>
 	
@@ -131,7 +131,8 @@
 		let {idx}=getDatasetIdx(chkparam.paramCode)
 		//console.log(idx+""+chkparam.checked)
 		if(chkparam.checked&&idx==null){
-			tableHead.value.push(chkparam)
+			let {checked,...paramItem}=chkparam
+			tableHead.value.push(paramItem)
 		}
 		else if(!chkparam.checked&&idx!=null){
 			tableHead.value.splice(idx, 1)

+ 31 - 5
src/pages/single/WellPatrolMix.vue

@@ -78,7 +78,7 @@
 	import Diagram from '../../components/diagram/Diagram.vue'
 	import wellPatrolAPI from '../../api/wellPatrol.js'
 	import wellParamAPI from '../../api/wellParam.js'
-	import tempAPI from '../../api/multiTabTemp.js'
+	import tempAPI from '../../api/tempMgr.js'
 	import { storeToRefs } from 'pinia'
 	import { useHomeStore } from '../../store/home.js'
 	import utils from '@/utils/utils.js'
@@ -204,8 +204,8 @@
 	const patrolData=ref({})
 	const patrolAlarm=ref({})
 	const loadSingleData=(wellId)=>{
-		wellPatrolAPI.loadData(wellId).then(resp=>{
-			//console.log(resp)
+		wellPatrolAPI.loadDynParamData(wellId).then(resp=>{
+			console.log(resp)
 			if(resp.code!=0||!resp.data){
 				ElMessage.error(resp.msg||'未获取到实时数据')
 				return
@@ -220,6 +220,32 @@
 	}
 	
 	const loadWellParam=(wellId)=>{
+		wellPatrolAPI.loadWellDynParamTemp(wellId).then(resp=>{
+			//console.log(resp)
+			if(resp.code!=0){
+				ElMessage.error(resp.msg||'获取动态参数模板失败')
+				return
+			}
+			if(!resp.data || !resp.data.temp){
+				return
+			}
+			
+			let tempDtl=JSON.parse(resp.data.temp.tempContent)
+			let unitMap=resp.data.units||{}
+			tempDtl.forEach(param=>{
+				param.displayUnit=unitMap[param.paramCode]||''
+			})
+			
+			singleParams.value=tempDtl
+			
+			nextTick(()=>{
+				loadSingleData(wellId)
+			})
+			
+		}).catch(err=>{
+			
+		})
+		
 		wellParamAPI.loadWellParam(wellId).then(resp=>{
 			
 			if(resp.code!=0){
@@ -227,12 +253,13 @@
 				return
 			}
 			diagramParams.value=resp.data.filter(param=>param.paramCode.indexOf('diagram')>=0)
+			/*
 			singleParams.value = resp.data.filter(param=>param.paramCode.indexOf('diagram')<0)
 			
 			nextTick(()=>{
 				loadSingleData(wellId)
 				singleTimer=setInterval(()=>{loadSingleData(wellId)},30000)
-			})
+			})*/
 			
 		}).catch(err=>{
 			
@@ -259,7 +286,6 @@
 			}
 			let tempDtl=JSON.parse(resp.data.temp.tempContent)
 			bindParamUnit(tempDtl,resp.data.units)
-			
 			mixgroupCurveComp.value.init(tempDtl)
 			mixgroupCurveComp.value.drawMain()