diff --git a/UserClass/PrintHelper.cs b/UserClass/PrintHelper.cs
index 7ed66e8..9fc0f9a 100644
--- a/UserClass/PrintHelper.cs
+++ b/UserClass/PrintHelper.cs
@@ -81,7 +81,7 @@ namespace formula_manage.UserClass
string chineseSimpleFrl = AppDomain.CurrentDomain.BaseDirectory + @"FastReport\Localization\language.frl";
FastReport.Utils.Res.LoadLocale(chineseSimpleFrl);
}
- catch (Exception ex)
+ catch (Exception)
{
}
diff --git a/UserClass/StrToInt.cs b/UserClass/StrToInt.cs
index 3c74600..b6c50df 100644
--- a/UserClass/StrToInt.cs
+++ b/UserClass/StrToInt.cs
@@ -27,7 +27,7 @@ namespace formula_manage.UserClass
//int r3 = Convert.ToInt32(str, 16);
//Console.WriteLine(r3);
}
- catch (Exception e)
+ catch (Exception)
{
res = 0;
}
diff --git a/Windows/Print.xaml b/Windows/Print.xaml
index 8786329..36049a9 100644
--- a/Windows/Print.xaml
+++ b/Windows/Print.xaml
@@ -36,7 +36,7 @@
-
+
diff --git a/Windows/Print.xaml.cs b/Windows/Print.xaml.cs
index 10e41df..2910723 100644
--- a/Windows/Print.xaml.cs
+++ b/Windows/Print.xaml.cs
@@ -78,8 +78,8 @@ namespace formula_manage.Windows
Template_M.Text = Temp_M;//传入保存的默认模板
Template_S.Text = Temp_S;//
- Template.ItemsSource = files_M;
- Template.DisplayMemberPath = "Name";
+ PrintTemplate.ItemsSource = files_M;
+ PrintTemplate.DisplayMemberPath = "Name";
}
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e) //窗口关闭事件
@@ -209,7 +209,7 @@ namespace formula_manage.Windows
list.Add(xePrintName);
}
}
- catch (Exception ex)
+ catch (Exception)
{
}
@@ -221,7 +221,7 @@ namespace formula_manage.Windows
Prompt.Visibility = Visibility.Visible; //开启页面遮罩
- string Template_path = Print_path.Text + "/" + Template.Text;
+ string Template_path = Print_path.Text + "/" + PrintTemplate.Text;
string Template_DATA = "\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n";
if (File.Exists(Template_path)) //判断文件是否存在
@@ -230,7 +230,7 @@ namespace formula_manage.Windows
Prompt.Visibility = Visibility.Hidden;//去页面遮罩
return;
}
- if (string.IsNullOrEmpty(Template.Text))
+ if (string.IsNullOrEmpty(PrintTemplate.Text))
{
System.Windows.MessageBox.Show("模板名不能为空");
Prompt.Visibility = Visibility.Hidden;//去页面遮罩
@@ -247,7 +247,7 @@ namespace formula_manage.Windows
}
PRINT_file(); ;//刷新模板列表
- Template.Text = null;//清空输入
+ PrintTemplate.Text = null;//清空输入
Prompt.Visibility = Visibility.Hidden;//去页面遮罩
}
@@ -256,7 +256,7 @@ namespace formula_manage.Windows
{
try
{
- string Template_path = Print_path.Text + "/" + Template.Text;
+ string Template_path = Print_path.Text + "/" + PrintTemplate.Text;
File.Delete(Template_path);
}
catch
@@ -264,11 +264,11 @@ namespace formula_manage.Windows
System.Windows.MessageBox.Show("删除失败");
}
- Template.Text = null;
+ PrintTemplate.Text = null;
DirectoryInfo di_M = new DirectoryInfo(Print_path.Text); //new文件夹
FileInfo[] files_M = di_M.GetFiles("*.frx");//生成文件夹中的文件名合集
- Template.ItemsSource = files_M;//加载合集
- Template.DisplayMemberPath = "Name"; // 显示文件名
+ PrintTemplate.ItemsSource = files_M;//加载合集
+ PrintTemplate.DisplayMemberPath = "Name"; // 显示文件名
}
}
}