diff --git a/src/components/dialog/angleDialog.vue b/src/components/dialog/angleDialog.vue
index 7b9dd33..0d8ab04 100644
--- a/src/components/dialog/angleDialog.vue
+++ b/src/components/dialog/angleDialog.vue
@@ -124,7 +124,14 @@ export default {
async getChartsData(devId) {
this.desHander()
let res = await getTowerDevAttributeRecordByDevice({devId})
- this.generateCharts(res.data.slice(0,9))
+ let arr = []
+ res.data.forEach(item=>{
+ if(item.jcName=="角度Y"){
+ arr.push(item)
+ }
+ })
+ console.log(arr)
+ this.generateCharts(arr.slice(0,9))
},
//打开时触发
openChart() {
@@ -153,6 +160,16 @@ export default {
// 倾角图表
let tempOption = {
+ title: {
+ top: 0,
+ left: 0,
+ text: '倾角',
+ // subtext: '',
+ textStyle: {
+ color: '#000',
+ fontSize: 16,
+ }
+ },
tooltip: {
trigger: 'axis',
axisPointer: {
diff --git a/src/components/dialog/dipDialog.vue b/src/components/dialog/dipDialog.vue
index 8519d73..dffea44 100644
--- a/src/components/dialog/dipDialog.vue
+++ b/src/components/dialog/dipDialog.vue
@@ -177,6 +177,16 @@ export default {
// 含氧量图表
let O2Option = {
+ title: {
+ top: 0,
+ left: 0,
+ text: '含氧量',
+ // subtext: '',
+ textStyle: {
+ color: '#000',
+ fontSize: 16,
+ }
+ },
tooltip: {
trigger: 'axis',
axisPointer: {
@@ -234,6 +244,16 @@ export default {
O2Chart.setOption(O2Option)
// 可燃气体图表
let fireOption = {
+ title: {
+ top: 0,
+ left: 0,
+ text: '可燃气体',
+ // subtext: '',
+ textStyle: {
+ color: '#000',
+ fontSize: 16,
+ }
+ },
grid: {
width: '80%',
height: '60%'
@@ -285,6 +305,16 @@ export default {
fireChart.setOption(fireOption)
// 一氧化碳图表
let COOption = {
+ title: {
+ top: 0,
+ left: 0,
+ text: '一氧化碳',
+ // subtext: '',
+ textStyle: {
+ color: '#000',
+ fontSize: 16,
+ }
+ },
grid: {
width: '80%',
height: '60%'
@@ -340,6 +370,16 @@ export default {
COChart.setOption(COOption)
// 硫化氢图表
let H2SOption = {
+ title: {
+ top: 0,
+ left: 0,
+ text: '硫化氢',
+ // subtext: '',
+ textStyle: {
+ color: '#000',
+ fontSize: 16,
+ }
+ },
grid: {
width: '80%',
height: '60%'
diff --git a/src/components/dialog/envirDialog.vue b/src/components/dialog/envirDialog.vue
index 5426ca5..c2fedef 100644
--- a/src/components/dialog/envirDialog.vue
+++ b/src/components/dialog/envirDialog.vue
@@ -184,6 +184,16 @@ export default {
})
// 温度图表
let tempOption = {
+ title: {
+ top: 0,
+ left: 0,
+ text: '温度',
+ // subtext: '',
+ textStyle: {
+ color: '#000',
+ fontSize: 16,
+ }
+ },
tooltip: {
trigger: 'axis',
axisPointer: {
@@ -241,6 +251,16 @@ export default {
tempChart.setOption(tempOption)
// 湿度图表
let wetOption = {
+ title: {
+ top: 0,
+ left: 0,
+ text: '湿度',
+ // subtext: '',
+ textStyle: {
+ color: '#000',
+ fontSize: 16,
+ }
+ },
grid: {
width: '80%',
height: '60%'
@@ -296,6 +316,16 @@ export default {
wetChart.setOption(wetOption)
// 噪声图表
let loudOption = {
+ title: {
+ top: 0,
+ left: 0,
+ text: '噪声',
+ // subtext: '',
+ textStyle: {
+ color: '#000',
+ fontSize: 16,
+ }
+ },
grid: {
width: '80%',
height: '60%'
@@ -347,6 +377,16 @@ export default {
loudChart.setOption(loudOption)
// 空气质量图表
let airOption = {
+ title: {
+ top: 0,
+ left: 0,
+ text: '空气质量',
+ // subtext: '',
+ textStyle: {
+ color: '#000',
+ fontSize: 16,
+ }
+ },
grid: {
width: '80%',
height: '60%'
diff --git a/src/components/dialog/pullDialog.vue b/src/components/dialog/pullDialog.vue
index 69c060f..6966da9 100644
--- a/src/components/dialog/pullDialog.vue
+++ b/src/components/dialog/pullDialog.vue
@@ -69,8 +69,8 @@ import {
queryEnvironmentInfoByIdApi,
getTowerDevAttributeRecordByDevice,
queryWarnInfoByIdApi
-} from '@/api/substation/substation'
-import * as echarts from 'echarts'
+} from '@/api/substation/substation';
+import * as echarts from 'echarts';
export default {
name: 'pullDialog',
components: {},
@@ -125,10 +125,15 @@ export default {
//获取echart数据
async getChartsData(devId) {
this.desHander()
- let res = await getTowerDevAttributeRecordByDevice({devId})
- // console.log(res)
-
- this.generateCharts(res.data.slice(0,9))
+ let res = await getTowerDevAttributeRecordByDevice({devId})
+ let arr = []
+ res.data.forEach(item=>{
+ if(item.jcName=="拉力"){
+ arr.push(item)
+ }
+ })
+ console.log(arr)
+ this.generateCharts(arr.slice(0,9))
},
//打开时触发
openChart() {
@@ -148,14 +153,24 @@ export default {
//渲染echart
generateCharts(list) {
console.log(list)
- let tempArr = list.map(item => {
+ let pullArr = list.map(item => {
return Number(item.jcValue)
})
- let tempXList = list.map(item => {
+ let pullXList = list.map(item => {
return item.xtime
})
// 拉力图表
- let tempOption = {
+ let pullOption = {
+ title: {
+ top: 0,
+ left: 0,
+ text: '拉力',
+ // subtext: '',
+ textStyle: {
+ color: '#000',
+ fontSize: 16,
+ }
+ },
tooltip: {
trigger: 'axis',
axisPointer: {
@@ -174,7 +189,7 @@ export default {
xAxis: [
{
type: 'category',
- data: tempXList,
+ data: pullXList,
axisTick: {
alignWithLabel: true
}
@@ -183,7 +198,7 @@ export default {
yAxis: [
{
type: 'value',
- name: '°'
+ name: 'N'
}
],
series: [
@@ -191,7 +206,7 @@ export default {
name: '拉力',
type: 'bar',
barWidth: '40%',
- data: tempArr,
+ data: pullArr,
itemStyle:{
// 设置柱状渐变色
color: new echarts.graphic.LinearGradient(0, 0, 1, 1, [
@@ -209,9 +224,8 @@ export default {
}
]
};
- let tempChart = echarts.init(document.querySelector('#pullWetChart'))
- tempChart.dispose()
- tempChart.setOption(tempOption)
+ let pullChart = echarts.init(document.querySelector('#pullWetChart'))
+ pullChart.setOption(pullOption)
},
// 销毁实例
@@ -220,7 +234,7 @@ export default {
myChart.dispose();
},
closeDialog() {
- echarts.init(document.getElementById('#pullWetChart')).dispose()
+ // echarts.init(document.getElementById('#pullWetChart')).dispose()
this.$emit('closeDialog')
}
},
diff --git a/src/components/dialog/tableDialog.vue b/src/components/dialog/tableDialog.vue
index 50bc91d..b189eaa 100644
--- a/src/components/dialog/tableDialog.vue
+++ b/src/components/dialog/tableDialog.vue
@@ -48,12 +48,12 @@
v-loading="loading"
:row-style="rowStyle"
>
-
+
+
+
+ {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
+
+
+
+
+
+
+
+
组塔监测
+
+
+
+
{{proData.proName}}
+
{{ item.label }}
+
+
+
+