RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SHGX-ZZCJ-24 tpm看板 小数点不显示 已完成

Browse Source
This commit is contained in:
赵正易 2025-06-12 14:17:34 +08:00
parent f20aba0f7e
commit c0ec7d2b1d
4 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
DOAN.Admin.WebApi/DataProtection/key-2f1ef1e5-4f23-41b5-a377-7adc57278503.xml Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<key id="2f1ef1e5-4f23-41b5-a377-7adc57278503" version="1">
<creationDate>2025-05-21T01:15:17.9323877Z</creationDate>
<activationDate>2025-05-22T08:24:47.0175384Z</activationDate>
<expirationDate>2025-08-19T01:15:17.5923527Z</expirationDate>
<descriptor deserializerType="Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
<descriptor>
<encryption algorithm="AES_256_CBC" />
<validation algorithm="HMACSHA256" />
<masterKey p4:requiresEncryption="true" xmlns:p4="http://schemas.asp.net/2015/03/dataProtection">
<!-- Warning: the key below is in an unencrypted form. -->
<value>s6xEh6JByKCQvFyKiJHPtAhNDw5Kavp4AMX+jl51879/6VgweRoK21rhxmCrXnUkgSM0dF6vSBGNxAN0SzIBRA==</value>
</masterKey>
</descriptor>
</descriptor>
</key>

12
DOAN.Model/MES/dev/Dto/DeviceStatusAnalysisResultDto.cs
View File

@ -76,7 +76,7 @@ namespace DOAN.Model.MES.dev.Dto
/// <summary>
/// 与上周对比 总数
/// </summary>
public double lastTotalPer { get; set; }
public int lastTotalPer { get; set; }
/// <summary>
/// 最大
/// </summary>
@ -84,7 +84,7 @@ namespace DOAN.Model.MES.dev.Dto
/// <summary>
/// 与上周对比 最大
/// </summary>
public double lastMaxPer { get; set; }
public int lastMaxPer { get; set; }
/// <summary>
/// 最小
@ -94,17 +94,17 @@ namespace DOAN.Model.MES.dev.Dto
/// <summary>
/// 与上周对比 最小
/// </summary>
public double lastMinPer { get; set; }
public int lastMinPer { get; set; }
/// <summary>
/// 任务平均
/// </summary>
public TimeSpan TaskAvg { get; set; }
/// <summary>
/// <summaryint
/// 与上周对比 任务平均
/// </summary>
public double lastAvgPer { get; set; }
public int lastAvgPer { get; set; }
public string[] XData { get; set; }
@ -151,7 +151,7 @@ namespace DOAN.Model.MES.dev.Dto
public bool showBackground { get; set; } = true;
public MarkPoint_ markPoint { get; set; }
public MarkPoint_ markLine { get; set; }
public double[] Data { get; set; }
public int[] Data { get; set; }
}
public class MarkPoint_

4
DOAN.Service/DW_production_trace/U30/DW_DWD_U30_OP10_Service.cs
View File

@ -58,7 +58,7 @@ namespace DOAN.Service.DataWarehouse.U30
dwdU30Op10LaboratoryData.Variance = "";
dwdU30Op10LaboratoryData.Station = "AudiA3" + "实验室" ;
dwdU30Op10LaboratoryData.Parameter = "";
dwdU30Op10LaboratoryData.Value = "";
/* dwdU30Op10LaboratoryData.Value = "";
dwdU30Op10LaboratoryData.LowerLimit = "";
dwdU30Op10LaboratoryData.UpperLimit = "";
dwdU30Op10LaboratoryData.InTime = "";
@ -70,7 +70,7 @@ namespace DOAN.Service.DataWarehouse.U30
dwdU30Op10LaboratoryData.FLastModifyUserId = "";
dwdU30Op10LaboratoryData.FDeleteTime = "";
dwdU30Op10LaboratoryData.FDeleteUserId = "";
dwdU30Op10LaboratoryData.FDeleteMark = "";
dwdU30Op10LaboratoryData.FDeleteMark = "";*/
dwdU30Op10LaboratoryData.NewStation = "";

14
DOAN.Service/MES/dev/DeviceDataAnalysisService.cs
View File

@ -447,7 +447,7 @@ namespace DOAN.Service.MES.dev
PersonnelResponseDto[] SecondDataCollection = new PersonnelResponseDto[InitDataCollection.Count];
string[] XData = new string[InitDataCollection.Count];
double[] resultDate = new double[InitDataCollection.Count];
int[] resultDate = new int[InitDataCollection.Count];
if (InitDataCollection.Count > 0)
{
int index = 0;
@ -498,7 +498,7 @@ namespace DOAN.Service.MES.dev
personnelResponseResultDto.TaskMin = SecondDataCollection.Min(it => it.Accept_response);
personnelResponseResultDto.TaskAvg = CalculateAverageTimeSpan(SecondDataCollection.Select(it => it.Action_response).ToArray());
personnelResponseResultDto.SeriesData = task_accept_series;
resultDate = SecondDataCollection.Select(it => Math.Round(it.Accept_response.TotalMinutes, 2)).ToArray();
resultDate = SecondDataCollection.Select(it => (int)Math.Ceiling(it.Accept_response.TotalMinutes)).ToArray();
}
else if (devicedefault.searchType == 2)
{
@ -507,7 +507,7 @@ namespace DOAN.Service.MES.dev
personnelResponseResultDto.TaskMin = SecondDataCollection.Min(it => it.Action_response);
personnelResponseResultDto.TaskAvg = CalculateAverageTimeSpan(SecondDataCollection.Select(it => it.Action_response).ToArray());
personnelResponseResultDto.SeriesData = task_accept_series;
resultDate = SecondDataCollection.Select(it => Math.Round(it.Action_response.TotalMinutes, 2)).ToArray();
resultDate = SecondDataCollection.Select(it => (int)Math.Ceiling(it.Action_response.TotalMinutes)).ToArray();
}
personnelResponseResultDto.XData = XData;
personnelResponseResultDto.SeriesData.Data = resultDate;
@ -536,16 +536,16 @@ namespace DOAN.Service.MES.dev
return crount;
}
private static double CalculatePercentageIncrease(int number1, int number2)
private static int CalculatePercentageIncrease(int number1, int number2)
{
if (number2 == 0)
{
return 100;
}
return ((double)(number1 - number2) / number2) * 100;
return ((int)(number1 - number2) / number2) * 100;
}
private static double CalculatePercentageIncrease(TimeSpan timeSpan1, TimeSpan timeSpan2)
private static int CalculatePercentageIncrease(TimeSpan timeSpan1, TimeSpan timeSpan2)
{
double totalSeconds1 = timeSpan1.TotalSeconds;
double totalSeconds2 = timeSpan2.TotalSeconds;
@ -555,7 +555,7 @@ namespace DOAN.Service.MES.dev
return 100;
}
return ((totalSeconds1 - totalSeconds2) / totalSeconds2) * 100;
return (int)((totalSeconds1 - totalSeconds2) / totalSeconds2) * 100;
}
public static TimeSpan CalculateAverageTimeSpan(TimeSpan[] timeSpans)
{