|
|
@@ -60,15 +60,15 @@ function changeSelect(val) {
|
|
|
objParam = {
|
|
|
// dataQ: selectData.readData.Fan1m3 || selectData.readData.Fan2m3 || selectData.readData.m3,
|
|
|
// dataH: Math.abs(Number(selectData.readData.Fan1FanPre || selectData.readData.Fan2FanPre || selectData.readData.DataPa || 0)),
|
|
|
- dataQ: 10529,
|
|
|
+ dataQ: 8529,
|
|
|
dataH: 686,
|
|
|
}
|
|
|
objParam1 = {
|
|
|
dataha0: -0.056,
|
|
|
dataha1: 1.0491, // 3.6491
|
|
|
- dataha2: 204.4, // 404.4
|
|
|
- dataha3: 175, // 100
|
|
|
- dataha4: -800,
|
|
|
+ dataha2: 304.4, // 404.4
|
|
|
+ dataha3: 155, // 100
|
|
|
+ dataha4: -1000,
|
|
|
}
|
|
|
setChart(objParam, objParam1);
|
|
|
getOption();
|
|
|
@@ -121,7 +121,7 @@ function getOption() {
|
|
|
color: ['#00bb00', '#ffbb00', '#ff0000', '#0000ff'],
|
|
|
xAxis: [
|
|
|
{
|
|
|
- name: '风量\r\n(m³/s)\r\n',
|
|
|
+ name: '风量\r\n(m³/min)\r\n',
|
|
|
nameTextStyle: {
|
|
|
color: '#3df6ff',
|
|
|
fontSize: 12,
|
|
|
@@ -222,6 +222,23 @@ function getOption() {
|
|
|
],
|
|
|
series: [
|
|
|
{
|
|
|
+ type: 'effectScatter',
|
|
|
+ symbolSize: 5,
|
|
|
+ // symbolOffset:[1, 1],
|
|
|
+ showEffectOn: 'render',
|
|
|
+ // 涟漪特效相关配置。
|
|
|
+ rippleEffect: {
|
|
|
+ // 波纹的绘制方式，可选 'stroke' 和 'fill'。
|
|
|
+ brushType: 'stroke'
|
|
|
+ },
|
|
|
+ zlevel: 1,
|
|
|
+ z: 999,
|
|
|
+ itemStyle: {
|
|
|
+ color: '#ff0000'
|
|
|
+ },
|
|
|
+ data: echartData.ydata2,
|
|
|
+ },
|
|
|
+ {
|
|
|
name: '风阻',
|
|
|
yAxisIndex: 0,
|
|
|
xAxisIndex: 1,
|
|
|
@@ -253,13 +270,13 @@ function getOption() {
|
|
|
|
|
|
// 设置曲线数据
|
|
|
function setChart(param, character) {
|
|
|
- param.dataQ = 300;
|
|
|
- param.dataH = character.dataha0 * param.dataQ * param.dataQ + character.dataha1 * param.dataQ + character.dataha2;
|
|
|
+ var dataQ = 300;
|
|
|
+ var dataH = character.dataha0 * dataQ * dataQ + character.dataha1 * dataQ + character.dataha2
|
|
|
let Q1 = Math.round((parseFloat(param.dataQ) / 60) * 100) / 100;
|
|
|
let H1 = parseFloat(param.dataH);
|
|
|
|
|
|
- let q = Q1 - character.dataha3;
|
|
|
- let h = H1 - character.dataha4;
|
|
|
+ let q = Q1 - dataQ;
|
|
|
+ let h = H1 - dataH;
|
|
|
// 风压特性曲线1
|
|
|
let data = [];
|
|
|
// 风压特性曲线2
|
|
|
@@ -277,6 +294,7 @@ function setChart(param, character) {
|
|
|
}
|
|
|
echartData.ydata = data
|
|
|
echartData.ydata1 = data2
|
|
|
+ echartData.ydata2 = [[Q1, H1]]
|
|
|
}
|
|
|
|
|
|
watch(
|
