综合.产品 界面添加密码

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs

@@ -51,6 +51,6 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.7.4.0")]
-[assembly: AssemblyFileVersion("7.7.4.0")]
+[assembly: AssemblyVersion("7.7.4.1")]
+[assembly: AssemblyFileVersion("7.7.4.1")]
 [assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgProfileBlowing.xaml.cs

@@ -113,6 +113,8 @@ namespace FLY.Thick.Blowing.UI
 
         private void Apply()
         {
+
+
             //有效性检查
             if (Param.Target <= 0)
             {
@@ -126,6 +128,9 @@ namespace FLY.Thick.Blowing.UI
                 return;
             }
 
+            if (!WdPassword.Authorize("Profile"))
+                return;
+
             profileService.Apply(Param);
             if (!ProfileList.Contains(Param.PName))
             {
@@ -139,15 +144,19 @@ namespace FLY.Thick.Blowing.UI
 
         private void Del()
         {
-            if (listview_profile.SelectedItem != null)
-            {
-                string productname = listview_profile.SelectedItem as string;
+            if (listview_profile.SelectedItem == null)
+                return;
+
+            //输入密码
+            if (!WdPassword.Authorize("Profile"))
+                return;
+            string productname = listview_profile.SelectedItem as string;
                 profileService.Del(productname);
                 ProfileList.Remove(productname);
                 FLY.ControlLibrary.Window_Tip.Show("删除成功",
                     productname,
                     TimeSpan.FromSeconds(2));
-            }
+            
         }
 
         private void Ahelper()

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs

@@ -51,6 +51,6 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.7.4.0")]
-[assembly: AssemblyFileVersion("7.7.4.0")]
+[assembly: AssemblyVersion("7.7.4.1")]
+[assembly: AssemblyFileVersion("7.7.4.1")]
 [assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]

Project.FLY.Unions/FLY.Unions.UI/UcTAreaProfile.xaml.cs

@@ -187,6 +187,9 @@ namespace FLY.Unions.UI
             if (SelectedItem == null)
                 return;
 
+            if (!WdPassword.Authorize("Profile"))
+                return;
+
             string productname = SelectedItem;
             tAreaProfileService.Del(productname);
             ProfileList.Remove(productname);
@@ -198,6 +201,7 @@ namespace FLY.Unions.UI
 
         private void Apply()
         {
+
             //有效性检查
             if (string.IsNullOrEmpty(Param.PName))
             {
@@ -205,6 +209,10 @@ namespace FLY.Unions.UI
                 return;
             }
 
+            if (!WdPassword.Authorize("Profile"))
+                return;
+
+
             tAreaProfileService.Apply(Param.GetValue());
 
             if (!ProfileList.Contains(Param.PName))

Project.FLY.Unions/FLY.Unions.UI/UcThkProfile.xaml.cs

@@ -116,6 +116,8 @@ namespace FLY.Unions.UI
                 return;
             }
 
+
+
             //有效性检查
             if (Param.Target <= 0)
             {
@@ -129,6 +131,10 @@ namespace FLY.Unions.UI
                 return;
             }
 
+            //输入密码
+            if (!WdPassword.Authorize("Profile"))
+                return;
+
             profileService.Apply(Param);
             if (!ProfileList.Contains(Param.PName))
             {
@@ -144,15 +150,18 @@ namespace FLY.Unions.UI
 
         private void Del()
         {
-            if (SelectedItem != null)
-            {
-                string productname = SelectedItem;
+            if (SelectedItem == null)
+                return;
+            //输入密码
+            if (!WdPassword.Authorize("Profile"))
+                return;
+            string productname = SelectedItem;
                 profileService.Del(productname);
                 ProfileList.Remove(productname);
                 FLY.ControlLibrary.Window_Tip.Show("删除成功",
                     productname,
                     TimeSpan.FromSeconds(2));
-            }
+            
         }
 
         private void Ahelper()

Project.FLY.Unions/FLY.Unions.UI/UcWeightProfile.xaml.cs

@@ -187,10 +187,6 @@ namespace FLY.Unions.UI
 
         private void ToPlc()
         {
-            //输入密码
-            if (!WdPassword.Authorize("Profile"))
-                return;
-
             //有效性检查
             if (string.IsNullOrEmpty(Param.PName))
             {
@@ -198,6 +194,10 @@ namespace FLY.Unions.UI
                 return;
             }
 
+            //输入密码
+            if (!WdPassword.Authorize("Profile"))
+                return;
+
             weightProfileService.Apply(Param.GetValue());
 
             if (!ProfileList.Contains(Param.PName))
@@ -243,6 +243,9 @@ namespace FLY.Unions.UI
             if (SelectedItem == null)
                 return;
 
+            if (!WdPassword.Authorize("Profile"))
+                return;
+
             string productname = SelectedItem;
             weightProfileService.Del(productname);
             ProfileList.Remove(productname);
@@ -260,6 +263,8 @@ namespace FLY.Unions.UI
                 FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "称重配方名称为空");
                 return;
             }
+            if (!WdPassword.Authorize("Profile"))
+                return;
 
             weightProfileService.Apply(Param.GetValue());
 

脚本/hemeiInstallZipVersionInfo.json

 {
-  "InstallZipVersion":"7.7.4.0",
-  "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.7.4.0_20230214.7z"
+  "InstallZipVersion":"7.7.4.1",
+  "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.7.4.1_20230214.7z"
 }
\ No newline at end of file