From 0761d9e95393d7f0301a49613c095db363d79e75 Mon Sep 17 00:00:00 2001
From: yupan <yupanx@163.com>
Date: Thu, 27 Oct 2022 09:50:21 +0800
Subject: [PATCH] 1、新增站点数据页面 2、修改监测因子趋势显示bug 3、修改监测因子趋势和监测因子对比页面的时间控件
---
src/views/averageContrast/index.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/views/averageContrast/index.vue b/src/views/averageContrast/index.vue
index 4c9d7ed..8c98eeb 100644
--- a/src/views/averageContrast/index.vue
+++ b/src/views/averageContrast/index.vue
@@ -20,7 +20,7 @@
<el-radio-button label="������" />
<el-radio-button label="������" />
</el-radio-group> -->
- <component :is="dataType" style="padding-left:0;margin-left:20px;width:160px" @sendPickerChild="showPickerChild" />
+ <component :is="dataType" style="padding-left:0;margin-left:20px;width:160px" @sendPickerChild="showPickerChild" />
<!--������������-->
<el-button @click="selectData" class="btn1">������</el-button>
</div>
@@ -41,6 +41,8 @@
import DatePicker from '@/components/Form/DatePicker'
import MouthPicker from '@/components/Form/MouthPicker'
import HourPicker from '@/components/Form/HourPicker'
+import HourPicker2 from '@/components/Form/HourPicker2'
+
import CustomPicker from '@/components/Form/CustomPicker'
import json from '@/assets/json/sensor.json'
@@ -69,7 +71,8 @@
DatePicker,
MouthPicker,
HourPicker,
- CustomPicker
+ HourPicker2,
+ CustomPicker,
},
filters: {
sensorFilter: function(value) {
@@ -83,7 +86,7 @@
data() {
// ������������������
return {
- dataType: 'HourPicker',
+ dataType: 'HourPicker2',
lineChartData: lineChartData.purchases,
props: { multiple: true },
options: [],
@@ -94,7 +97,7 @@
// newMac2:'',
newSensor: [],
radio1: '������',
- unit: 1,
+ unit: 0,
type: 'select',
newLineChartData: {
series: [],
@@ -120,10 +123,10 @@
},
radio1(nv, ov) {
if (nv === '������') {
- this.dataType = 'HourPicker'
+ this.dataType = 'HourPicker2'
this.unit = 1
} else if (nv === '������') {
- this.dataType = 'DatePicker'
+ this.dataType = 'MouthPicker2'
this.unit = 3
}
}
@@ -234,7 +237,7 @@
}
this.lineChartData = newLineChartData
}).catch((err) => {
- console.log(err)
+ console.log(err);
})
},
// ���������������������������������������������
@@ -300,6 +303,7 @@
return value2 - value1
}
}
+
},
// ������������������������
filterSensorName() {
--
Gitblit v1.8.0