guorui/SOMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复巡检结果时，没有deviceName的问题

Browse Source
This commit is contained in:
qsp89 2025-11-21 20:04:39 +08:00
parent 01fed80784
commit 8587b14906
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/YunDa.Server/YunDa.Server.ISMSTcp/Services/SecondaryCircuitInspectionPlanService.cs
View File

@ -525,8 +525,8 @@ namespace YunDa.Server.ISMSTcp.Services
private async Task ExecutePlan(SecondaryCircuitInspectionItemOutputEx itemEx) private async Task ExecutePlan(SecondaryCircuitInspectionItemOutputEx itemEx)
{ {
string func2 = ""; //string func2 = "";
string data2 = ""; //string data2 = "";
try try
{ {
var item = itemEx.Item; var item = itemEx.Item;
@ -554,7 +554,6 @@ namespace YunDa.Server.ISMSTcp.Services
var engine = new Jint.Engine(); var engine = new Jint.Engine();
engine.Execute(item.CalculationExpression); engine.Execute(item.CalculationExpression);
func2 = item.CalculationExpression;
ObjectInstance? saveObj = null; ObjectInstance? saveObj = null;
@ -632,7 +631,6 @@ namespace YunDa.Server.ISMSTcp.Services
var js = $"JSON.parse('{json.Replace("'", "\\'")}')"; var js = $"JSON.parse('{json.Replace("'", "\\'")}')";
data2 = json;
var jsObj = engine.Evaluate(js).ToObject(); var jsObj = engine.Evaluate(js).ToObject();

1
src/YunDa.Server/YunDa.Server.ISMSTcp/Services/ZzDataCacheContainer.cs
View File

@ -97,6 +97,7 @@ namespace YunDa.Server.ISMSTcp.Services
{ {
public string Id { get; set; } = string.Empty; public string Id { get; set; } = string.Empty;
public string Name { get; set; } = string.Empty; public string Name { get; set; } = string.Empty;
public string DeviceName { get; set; } = string.Empty;
public int? DispatcherAddress { get; set; } = null; public int? DispatcherAddress { get; set; } = null;
public double Value { get; set; } public double Value { get; set; }
public string ValueStr { get; set; } = string.Empty; public string ValueStr { get; set; } = string.Empty;