diff --git a/src/api/ems/record/recordSteamInstant.js b/src/api/ems/record/recordSteamInstant.js
index b963c8c..bcbfa52 100644
--- a/src/api/ems/record/recordSteamInstant.js
+++ b/src/api/ems/record/recordSteamInstant.js
@@ -1,6 +1,6 @@
import request from '@/utils/request'
-// 查询蒸汽实时数据列表
+// 查询蒸汽历史数据列表
export function listRecordSteamInstant(query) {
return request({
url: '/ems/record/recordSteamInstant/list',
@@ -9,7 +9,7 @@ export function listRecordSteamInstant(query) {
})
}
-// 查询蒸汽实时数据详细
+// 查询蒸汽历史数据详细
export function getRecordSteamInstant(objId) {
return request({
url: '/ems/record/recordSteamInstant/' + objId,
@@ -17,7 +17,7 @@ export function getRecordSteamInstant(objId) {
})
}
-// 新增蒸汽实时数据
+// 新增蒸汽历史数据
export function addRecordSteamInstant(data) {
return request({
url: '/ems/record/recordSteamInstant',
@@ -26,7 +26,7 @@ export function addRecordSteamInstant(data) {
})
}
-// 修改蒸汽实时数据
+// 修改蒸汽历史数据
export function updateRecordSteamInstant(data) {
return request({
url: '/ems/record/recordSteamInstant',
@@ -35,7 +35,7 @@ export function updateRecordSteamInstant(data) {
})
}
-// 删除蒸汽实时数据
+// 删除蒸汽历史数据
export function delRecordSteamInstant(objId) {
return request({
url: '/ems/record/recordSteamInstant/' + objId,
@@ -44,7 +44,7 @@ export function delRecordSteamInstant(objId) {
}
-// 查询蒸汽实时数据(曲线)
+// 查询蒸汽历史数据(曲线)
export function steamInstantList(query) {
return request({
url: '/ems/record/recordSteamInstant/steamInstantList',
@@ -52,3 +52,13 @@ export function steamInstantList(query) {
params: query
})
}
+
+//查询蒸汽实时最后一条数据
+export function latestSteamInstantList(query) {
+ return request({
+ url: '/ems/record/recordSteamInstant/latestSteamInstantList',
+ method: 'get',
+ params: query
+ })
+}
+
diff --git a/src/views/ems/record/recordLatestSteamInstant/index.vue b/src/views/ems/record/recordLatestSteamInstant/index.vue
new file mode 100644
index 0000000..4a107f7
--- /dev/null
+++ b/src/views/ems/record/recordLatestSteamInstant/index.vue
@@ -0,0 +1,496 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/ems/record/recordSteamInstant/index.vue b/src/views/ems/record/recordSteamInstant/index.vue
index 75a2001..d75b686 100644
--- a/src/views/ems/record/recordSteamInstant/index.vue
+++ b/src/views/ems/record/recordSteamInstant/index.vue
@@ -171,7 +171,7 @@
@pagination="getList"
/>
-
+
@@ -273,7 +273,7 @@ export default {
showSearch: true,
// 总条数
total: 0,
- // 蒸汽实时数据表格数据
+ // 蒸汽历史数据表格数据
recordSteamInstantList: [],
// 弹出层标题
title: '',
@@ -359,7 +359,7 @@ export default {
this.baseMonitorInfoOptions.push(data)
})
},
- /** 查询蒸汽实时数据列表 */
+ /** 查询蒸汽历史数据列表 */
getList() {
this.loading = true
this.queryParams.params = {}
@@ -442,7 +442,7 @@ export default {
handleAdd() {
this.reset()
this.open = true
- this.title = '添加蒸汽实时数据'
+ this.title = '添加蒸汽历史数据'
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -451,7 +451,7 @@ export default {
getRecordSteamInstant(objId).then(response => {
this.form = response.data
this.open = true
- this.title = '修改蒸汽实时数据'
+ this.title = '修改蒸汽历史数据'
})
},
/** 提交按钮 */
@@ -477,7 +477,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const objIds = row.objId || this.ids
- this.$modal.confirm('是否确认删除蒸汽实时数据编号为"' + objIds + '"的数据项?').then(function() {
+ this.$modal.confirm('是否确认删除蒸汽历史数据编号为"' + objIds + '"的数据项?').then(function() {
return delRecordSteamInstant(objIds)
}).then(() => {
this.getList()
diff --git a/src/views/ems/report/currentSteamCurve/index.vue b/src/views/ems/report/currentSteamCurve/index.vue
index a2a204e..42eac17 100644
--- a/src/views/ems/report/currentSteamCurve/index.vue
+++ b/src/views/ems/report/currentSteamCurve/index.vue
@@ -54,15 +54,12 @@
重置
-
-
-
@@ -85,7 +82,6 @@ export default {
},
data() {
return {
-
//下拉树List
baseMonitorInfoOptions: [],
//左侧树结构List
@@ -228,7 +224,6 @@ export default {
density: null,
differencePress: null,
recordTime: null
-
}
this.resetForm('form')
},
@@ -269,8 +264,6 @@ export default {
handleNodeClick(data) {
/* this.queryParams.monitorCode = data.code*/
this.queryParams.sensorId = data.code
- console.log("this.queryParams.sensorId"+this.queryParams.sensorId)
-
this.selectMonitorName = data.label
this.handleQuery()
},
@@ -361,16 +354,6 @@ export default {
showAllSymbol: true, //显示所有图形。
symbol: 'circle', //标记的图形为实心圆
symbolSize: 10, //标记的大小
- // itemStyle: {
- // //折线拐点标志的样式
- // color: "#058cff",
- // },
- // lineStyle: {
- // color: "#058cff",
- // },
- // areaStyle: {
- // color: "rgba(5,140,255, 0.2)",
- // },
data: data.map(e => e.fluxFlow)
},
]
@@ -455,16 +438,6 @@ export default {
showAllSymbol: true, //显示所有图形。
symbol: 'circle', //标记的图形为实心圆
symbolSize: 10, //标记的大小
- // itemStyle: {
- // //折线拐点标志的样式
- // color: "#058cff",
- // },
- // lineStyle: {
- // color: "#058cff",
- // },
- // areaStyle: {
- // color: "rgba(5,140,255, 0.2)",
- // },
data: data.map(e => e.steamFlow)
},
]
@@ -548,16 +521,6 @@ export default {
showAllSymbol: true, //显示所有图形。
symbol: 'circle', //标记的图形为实心圆
symbolSize: 10, //标记的大小
- // itemStyle: {
- // //折线拐点标志的样式
- // color: "#058cff",
- // },
- // lineStyle: {
- // color: "#058cff",
- // },
- // areaStyle: {
- // color: "rgba(5,140,255, 0.2)",
- // },
data: data.map(e => e.heatInstantValue)
},
]
@@ -641,15 +604,6 @@ export default {
showAllSymbol: true, //显示所有图形。
symbol: 'circle', //标记的图形为实心圆
symbolSize: 10, //标记的大小
- // itemStyle: {
- // color: "#058cff",
- // },
- // lineStyle: {
- // color: "#058cff",
- // },
- // areaStyle: {
- // color: "rgba(5,140,255, 0.2)",
- // },
data: data.map(e => e.heatTotalValue)
},
]