diff --git a/src/views/ems/report/currentSteamCurve/index.vue b/src/views/ems/report/currentSteamCurve/index.vue index e15958f..2aec159 100644 --- a/src/views/ems/report/currentSteamCurve/index.vue +++ b/src/views/ems/report/currentSteamCurve/index.vue @@ -72,6 +72,7 @@ import { parseTime } from '@/utils/ruoyi' import Chart from '@/components/Charts/Chart' import * as echarts from 'echarts' import {pointSteamInstantList} from "@/api/ems/report/reportPointSteam"; +import {listRecordSteamInstant, steamInstantList} from "@/api/ems/record/recordSteamInstant"; export default { name: 'currentSteamCurve', @@ -117,12 +118,16 @@ export default { pageSize: 10, monitorCode: null, monitorName: null, - instrumentValue: null, - expend: null, - recordTime: null, - beginTime: null, - endTime: null, - updateFlag: null + collectTime: null, + fluxFlow: null, + steamFlow: null, + heatInstantValue: null, + heatTotalValue: null, + temperature: null, + press: null, + density: null, + differencePress: null, + recordTime: null }, // 表单参数 form: {}, @@ -137,18 +142,18 @@ export default { ] }, columns: [ - { key: 0, label: `主键标识`, visible: false }, + { key: 0, label: `自增标识`, visible: false }, { key: 1, label: `计量设备编号`, visible: true }, - { key: 2, label: `仪表值`, visible: true }, - { key: 3, label: `耗量`, visible: true }, - { key: 4, label: `记录时间`, visible: false }, - { key: 5, label: `开始时间`, visible: true }, - { key: 6, label: `结束时间`, visible: true }, - { key: 7, label: `修改标识`, visible: true }, - { key: 8, label: `创建人`, visible: false }, - { key: 9, label: `创建时间`, visible: false }, - { key: 10, label: `更新人`, visible: false }, - { key: 11, label: `更新时间`, visible: false }, + { key: 2, label: `采集时间`, visible: true }, + { key: 3, label: `瞬时流量`, visible: true }, + { key: 4, label: `累计流量`, visible: true }, + { key: 5, label: `瞬时热量`, visible: true }, + { key: 6, label: `累计热量`, visible: true }, + { key: 7, label: `温度`, visible: false }, + { key: 8, label: `压力`, visible: false }, + { key: 9, label: `密度`, visible: false }, + { key: 10, label: `压力差值`, visible: false }, + { key: 11, label: `记录时间`, visible: true }, { key: 12, label: `计量设备名称`, visible: true } ] } @@ -257,10 +262,10 @@ export default { /** 曲线 */ async getChart() { let query = JSON.parse(JSON.stringify(this.queryParams)) - const {data} = await pointSteamInstantList(query) + const {data} = await steamInstantList(query) let option1 = { title: { - text: this.selectMonitorName + ' 耗量', + text: this.selectMonitorName + ' 瞬时流量', x: 'center' }, grid: { @@ -305,7 +310,7 @@ export default { yAxis: [ { type: 'value', - name: '耗量', + name: '瞬时流量', nameTextStyle: { color: '#000000' }, @@ -331,348 +336,32 @@ export default { ], series: [ { - name: '耗量', + name: '瞬时流量', type: 'line', smooth: true, //平滑曲线显示 showAllSymbol: true, //显示所有图形。 symbol: 'circle', //标记的图形为实心圆 symbolSize: 10, //标记的大小 - data: data.map(e => e.expend) + data: data.map(e => e.fluxFlow) }, ] } - /* let option2 = { - title: { - text: this.selectMonitorName + ' 累计流量曲线', - x: 'center' - }, - grid: { - top: '15%', - bottom: '10%', - left: '10%', - right: '3%' - }, - dataZoom: [{ - type: 'slider' - }], - tooltip: { - trigger: 'axis', - axisPointer: { - type: 'shadow', - label: { - show: true - } - } - }, - legend: { - right: 0 - }, - xAxis: { - data: data.map(e => e.collectTime), - axisLine: { - show: true, //隐藏X轴轴线 - lineStyle: { - color: '#000000' - } - }, - axisTick: { - show: true //隐藏X轴刻度 - }, - axisLabel: { - show: true, - textStyle: { - color: '#000000' //X轴文字颜色 - } - } - }, - yAxis: [ - { - type: 'value', - name: '累计流量y', - nameTextStyle: { - color: '#000000' - }, - splitLine: { - show: false - }, - axisTick: { - show: true - }, - axisLine: { - show: true, - lineStyle: { - color: '#000000' - } - }, - axisLabel: { - show: true, - textStyle: { - color: '#000000' - } - } - } - ], - series: [ - { - name: '累计流量', - type: 'line', - smooth: true, //平滑曲线显示 - showAllSymbol: true, //显示所有图形。 - symbol: 'circle', //标记的图形为实心圆 - symbolSize: 10, //标记的大小 - data: data.map(e => e.steamFlow) - }, - ] - } - let option3 = { - title: { - text: this.selectMonitorName + ' 瞬时热量曲线', - x: 'center' - }, - grid: { - top: '15%', - bottom: '10%', - left: '10%', - right: '3%' - }, - tooltip: { - trigger: 'axis', - axisPointer: { - type: 'shadow', - label: { - show: true - } - } - }, - dataZoom: [{ - type: 'slider' - }], - legend: { - right: 0 - }, - xAxis: { - data: data.map(e => e.collectTime), - axisLine: { - show: true, //隐藏X轴轴线 - lineStyle: { - color: '#000000' - } - }, - axisTick: { - show: true //隐藏X轴刻度 - }, - axisLabel: { - show: true, - textStyle: { - color: '#000000' //X轴文字颜色 - } - } - }, - yAxis: [ - { - type: 'value', - name: '瞬时热量y', - nameTextStyle: { - color: '#000000' - }, - splitLine: { - show: false - }, - axisTick: { - show: true - }, - axisLine: { - show: true, - lineStyle: { - color: '#000000' - } - }, - axisLabel: { - show: true, - textStyle: { - color: '#000000' - } - } - } - ], - series: [ - { - name: '瞬时热量', - type: 'line', - smooth: true, //平滑曲线显示 - showAllSymbol: true, //显示所有图形。 - symbol: 'circle', //标记的图形为实心圆 - symbolSize: 10, //标记的大小 - data: data.map(e => e.heatInstantValue) - }, - ] - } - let option4 = { - title: { - text: this.selectMonitorName + ' 累计热量曲线', - x: 'center' - }, - grid: { - top: '15%', - bottom: '10%', - left: '10%', - right: '3%' - }, - tooltip: { - trigger: 'axis', - axisPointer: { - type: 'shadow', - label: { - show: true - } - } - }, - dataZoom: [{ - type: 'slider' - }], - legend: { - right: 0 - }, - xAxis: { - data: data.map(e => e.collectTime), - axisLine: { - show: true, //隐藏X轴轴线 - lineStyle: { - color: '#000000' - } - }, - axisTick: { - show: true //隐藏X轴刻度 - }, - axisLabel: { - show: true, - textStyle: { - color: '#000000' //X轴文字颜色 - } - } - }, - yAxis: [ - { - type: 'value', - name: '累计热量', - nameTextStyle: { - color: '#000000' - }, - splitLine: { - show: false - }, - axisTick: { - show: true - }, - axisLine: { - show: true, - lineStyle: { - color: '#000000' - } - }, - axisLabel: { - show: true, - textStyle: { - color: '#000000' - } - } - } - ], - series: [ - { - name: '累计热量', - type: 'line', - smooth: true, //平滑曲线显示 - showAllSymbol: true, //显示所有图形。 - symbol: 'circle', //标记的图形为实心圆 - symbolSize: 10, //标记的大小 - data: data.map(e => e.heatTotalValue) - }, - ] - }*/ this.$refs.Chart1.setData(option1) -/* this.$refs.Chart2.setData(option2) - this.$refs.Chart3.setData(option3) - this.$refs.Chart4.setData(option4)*/ -/* echarts.connect(this.$refs.Chart1.chart, this.$refs.Chart2.chart, this.$refs.Chart3.chart, this.$refs.Chart4.chart)*/ echarts.connect(this.$refs.Chart1.chart) - this.$refs.Chart1.chart.on('datazoom', (e) => { + this.$refs.Chart1.chart.on('datazoom', (e) => { option.dataZoom[0].start = e.start; option.dataZoom[0].end = e.end; this.$refs.Chart1.setData(option); }); -/* this.$refs.Chart1.chart.on('datazoom', (e) => { - option2.dataZoom[0].start = e.start - option2.dataZoom[0].end = e.end - this.$refs.Chart2.setData(option2) - option3.dataZoom[0].start = e.start - option3.dataZoom[0].end = e.end - this.$refs.Chart3.setData(option3) - option4.dataZoom[0].start = e.start - option4.dataZoom[0].end = e.end - this.$refs.Chart4.setData(option4) - })*/ - /* this.$refs.Chart2.chart.on('datazoom', (e) => { - option1.dataZoom[0].start = e.start - option1.dataZoom[0].end = e.end - this.$refs.Chart1.setData(option1) - option3.dataZoom[0].start = e.start - option3.dataZoom[0].end = e.end - this.$refs.Chart3.setData(option3) - option4.dataZoom[0].start = e.start - option4.dataZoom[0].end = e.end - this.$refs.Chart4.setData(option4) - }) - this.$refs.Chart3.chart.on('datazoom', (e) => { - option2.dataZoom[0].start = e.start - option2.dataZoom[0].end = e.end - this.$refs.Chart2.setData(option2) - option1.dataZoom[0].start = e.start - option1.dataZoom[0].end = e.end - this.$refs.Chart1.setData(option1) - option4.dataZoom[0].start = e.start - option4.dataZoom[0].end = e.end - this.$refs.Chart4.setData(option4) - }) - this.$refs.Chart4.chart.on('datazoom', (e) => { - option2.dataZoom[0].start = e.start - option2.dataZoom[0].end = e.end - this.$refs.Chart2.setData(option2) - option3.dataZoom[0].start = e.start - option3.dataZoom[0].end = e.end - this.$refs.Chart3.setData(option3) - option1.dataZoom[0].start = e.start - option1.dataZoom[0].end = e.end - this.$refs.Chart4.setData(option1) - })*/ } } }