Commit 60b9f44a authored by 潘栩锋's avatar 潘栩锋 🚴

1.修复 密码设不了

2.修复 数据导出 由于进度>1 异常
parent 8595e70b
...@@ -23,7 +23,24 @@ namespace FLY.Thick.FilmCasting.UI.DbViewer.Core ...@@ -23,7 +23,24 @@ namespace FLY.Thick.FilmCasting.UI.DbViewer.Core
{ {
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
public double Progress => TotalRow > 0 ? 1.0 * CurrRow / TotalRow : 1; public double Progress {
get {
if (TotalRow > 0)
{
if (CurrRow < TotalRow)
{
return 1.0 * CurrRow / TotalRow;
}
else
{
return 1;
}
}
else {
return 1;
}
}
}
public string Msg { get; private set; } public string Msg { get; private set; }
protected int TotalRow { get; private set; } = 1; protected int TotalRow { get; private set; } = 1;
......
Subproject commit e4c86d07ea66a8b7e25aef4734f54f932d543ab9 Subproject commit 65f73b68a3d2541471ba5e5f23c3faab1b76d9d5
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<lifetime type="singleton" /> <lifetime type="singleton" />
<constructor> <constructor>
<param name="serviceId" value="10000" /> <param name="serviceId" value="10000" />
<param name="connName" value="blowing" /> <param name="connName" value="gage0" />
</constructor> </constructor>
</register> </register>
<register type="WarningSystemManager"> <register type="WarningSystemManager">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment