From 4d14154c36ac5692aadc036eed97fb9f1c410e2a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 23 五月 2021 14:46:03 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index 0ddb270..0460482 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -839,7 +839,7 @@
}
var sensorType = sr.spk.Split(".")[1];
- var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId,sensorType);
+ var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId,"value");
if (revertObj != null)
{
if (revertObj.Code == StateCode.SUCCESS)
@@ -853,19 +853,18 @@
{
vs.Add(data.fieldName);
}
- ebl.InitXdata(vs);
+ ebl.InitXdataText(vs);
}
- yDataString += ebl.GetYdata(sr.name, revertData, tipColorStringList[i]);
+ yDataString += ebl.InitYdataText(sr.name, revertData, tipColorStringList[i]);
}
}
i++;
}
- ebl.InitYdataString(yDataString);
Application.RunOnMainThread(() =>
{
- myEchartsView.ShowWithOption(ebl.optionString);
+ myEchartsView.ShowWithOption(ebl.InitOption());
});
}
--
Gitblit v1.8.0