diff --git a/src/api/systemOverview.js b/src/api/systemOverview.js
index 20a689d..8c361f5 100644
--- a/src/api/systemOverview.js
+++ b/src/api/systemOverview.js
@@ -26,6 +26,9 @@ const saveSysSetting = (params) => postAction('/systemSetting/save', params)
// 油井实时数据:(油井实时参数、实时示功图、载荷分布图)
const getOilWellRealTimeData = (params) => getAction('/khOilRealtimeData/realtimeDataResults', params)
+// 天然气数据远传终端-实时运行参数(移动端)
+const getRealTimeRunningParams = (params) => getAction('/khNgRealtimeData/realtimeDataResults', params)
+
// 用户信息分页列表
const getUserPage = (params) => getAction('/sys/user/page', params)
// 添加用户
@@ -46,6 +49,7 @@ export {
getSysSetting,
saveSysSetting,
getOilWellRealTimeData,
+ getRealTimeRunningParams,
getUserPage,
addUserInfo,
delUserInfo,
diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index fecf516..98f34e3 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -499,7 +499,7 @@ button.ant-btn {
line-height: 16px;
}
.info-row .info-label::after {
- content: ':'
+ content: ':'
}
.info-row .info-value {
text-align: right;
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index 95f4d15..cb7296e 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -45,3 +45,13 @@ export const deviceType = {
export const wellheadArea = {
tree101: { label: '树101井', value: '1' }
}
+
+// 门站数据字典
+export const stationGateStationEnum = {
+ baimamenStation: { label: '白马门站', value: '1' }
+}
+
+// 门站数据字典
+export const dataAcquisitionEquipmentEnum = {
+ mediumPressureOutputFlowMeter: { label: '中压输出流量计', value: '1' }
+}
diff --git a/src/views/mobile/home/Home.vue b/src/views/mobile/home/Home.vue
index 71ab6e5..daa8b70 100644
--- a/src/views/mobile/home/Home.vue
+++ b/src/views/mobile/home/Home.vue
@@ -82,13 +82,13 @@
-
+
@@ -147,16 +147,14 @@
场站
门站
-
+
@@ -186,9 +184,15 @@ import CommonCard from '@comp/CommonCard'
import CommonCardInfo from '@comp/CommonCardInfo'
import ResponsiveChart from '@comp/ResponsiveChart'
import CommonEmpty from '@comp/CommonEmpty'
-import { getOilWellRealTimeData, getWellheadList } from '@api/systemOverview'
+import { getOilWellRealTimeData, getWellheadList, getRealTimeRunningParams } from '@api/systemOverview'
import { generateBaseOption } from '@/utils/charts'
-import { deviceType, wellheadArea, wellheadType } from '@/enums/commonEnums'
+import {
+ dataAcquisitionEquipmentEnum,
+ deviceType,
+ stationGateStationEnum,
+ wellheadArea,
+ wellheadType
+} from '@/enums/commonEnums'
import DictPicker from '@comp/vant/DictPicker'
import SelectPicker from '@comp/vant/SelectPicker'
@@ -218,25 +222,12 @@ const staticData = {
comment: '当前工作状态良好,请按时检查',
pumpType: '常规泵',
// 门站信息
- stationName: '济源1#2号站',
+ stationName: '白马门站',
region: '济宁区域',
terminalType: '电池供电设备',
flowmetersNumber: '30',
dataAcquisitionTerminals: '5',
- equipmentInstallationTime: '2024-12-25',
- // 实时运行参数
- realTimeRunningParamsList: [
- ...new Array(2).fill(0).map((_, i) => {
- return {
- channelNo: '济源1#通道' + i,
- cumulativeFlow: '1232222',
- instantaneousStandardCondition: '236.33',
- realTimeTemperature: '35',
- realTimePressure: '1.23',
- instantaneousWorkingConditions: '256.33'
- }
- })
- ]
+ equipmentInstallationTime: '2024-05-30'
}
export default {
@@ -253,6 +244,8 @@ export default {
hasData: false, // 有没有请求到数据
// 油井实时数据
oilWellRealTimeData: {},
+ // 实时运行参数
+ realTimeRunningParamsList: [],
// 所有面板展示的数据
allData: {},
// 定时器,用于10秒请求一次
@@ -305,13 +298,13 @@ export default {
// 实时运行参数
realTimeRunningParamsLeft: [
{ label: '通道编号', valueField: 'channelNo', unit: '' },
- { label: '累计流量', valueField: 'cumulativeFlow', unit: 'm³' },
- { label: '标况瞬时', valueField: 'instantaneousStandardCondition', unit: 'm³/d' }
+ { label: '累计流量', valueField: 'cumulativeFlow', unit: '' },
+ { label: '标况瞬时', valueField: 'stdInstant', unit: '' }
],
realTimeRunningParamsRight: [
- { label: '实时温度', valueField: 'realTimeTemperature', unit: '℃' },
- { label: '实时压力', valueField: 'realTimePressure', unit: 'Mpa' },
- { label: '工况瞬时', valueField: 'instantaneousWorkingConditions', unit: 'm³/d' }
+ { label: '实时温度', valueField: 'realTimeTemp', unit: '' },
+ { label: '实时压力', valueField: 'realTimePressure', unit: '' },
+ { label: '工况瞬时', valueField: 'operationalInstant', unit: '' }
]
},
// 油井下拉
@@ -336,15 +329,11 @@ export default {
switch (params.deviceType + '') {
// 天然气数据远传终端
case deviceType.transmissionTerminal.value:
- clearInterval(this.timer)
- this.timer = null
// 默认回显井场和单井
- this.$set(this.queryParam, 'stationGateStation', wellheadArea.tree101.value)
- this.loadOilWellList(wellheadArea.tree101.value).then(() => {
- this.$set(this.queryParam, 'dataAcquisitionEquipment', this.singleWellList[0].id)
- // 查询数据
- this.loadTransmissionTerminalData()
- })
+ this.$set(this.queryParam, 'stationGateStation', stationGateStationEnum.baimamenStation.value)
+ this.$set(this.queryParam, 'dataAcquisitionEquipment', dataAcquisitionEquipmentEnum.mediumPressureOutputFlowMeter.value)
+ // 查询数据
+ this.loadTransmissionTerminalData()
break
// 井口设备
case deviceType.wellheadEquipment.value:
@@ -369,7 +358,12 @@ export default {
this.clearPageData()
return
}
- this.loadOilWellRealTimeData()
+ // 每10秒请求一次实时数据
+ this.loadRealTimeRunningParams()
+ clearInterval(this.timer)
+ this.timer = setInterval(() => {
+ this.loadRealTimeRunningParams()
+ }, 1000 * 10)
},
// 获取井口设备页面数据
loadWellheadEquipment () {
@@ -408,6 +402,19 @@ export default {
}).finally(() => {
})
},
+ // 加载天然气数据远传终端实施参数
+ loadRealTimeRunningParams () {
+ getRealTimeRunningParams().then(res => {
+ if (res.success) {
+ const data = res.result || []
+ this.hasData = !!data.length
+ this.allData = Object.assign({}, staticData)
+ this.realTimeRunningParamsList = data
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
// 初始化 实时示功图
initIndicatorDiagram (data) {
this.$nextTick(() => {