|
@@ -351,9 +351,19 @@ namespace OTSSysMgrApp
|
|
|
{
|
|
|
radioButton_IncA.Checked = true;
|
|
|
}
|
|
|
- else if (Type == "CleannessA")
|
|
|
+ else
|
|
|
{
|
|
|
radioButton_CleannessA.Checked = true;
|
|
|
+ this.coB_CleannessType.SelectedIndexChanged -= new System.EventHandler(this.coB_CleannessType_SelectedIndexChanged);
|
|
|
+ if (Type == "TCCleannessA")
|
|
|
+ {
|
|
|
+ coB_CleannessType.SelectedIndex = 0;
|
|
|
+ }
|
|
|
+ else if(Type == "BatteryCleannessA")
|
|
|
+ {
|
|
|
+ coB_CleannessType.SelectedIndex = 1;
|
|
|
+ }
|
|
|
+ this.coB_CleannessType.SelectedIndexChanged += new System.EventHandler(this.coB_CleannessType_SelectedIndexChanged);
|
|
|
}
|
|
|
this.radioButton_IncA.CheckedChanged += new System.EventHandler(this.radioButton_IncA_CheckedChanged);
|
|
|
}
|
|
@@ -381,7 +391,7 @@ namespace OTSSysMgrApp
|
|
|
}
|
|
|
else if (radioButton_CleannessA.Checked)
|
|
|
{
|
|
|
- if (coB_CleannessType.SelectedItem.ToString() == "CleannessA")
|
|
|
+ if (coB_CleannessType.SelectedItem.ToString() == "TCCleannessA")
|
|
|
{
|
|
|
sourceFilepath += "\\CleannessA";
|
|
|
}
|
|
@@ -495,6 +505,8 @@ namespace OTSSysMgrApp
|
|
|
}
|
|
|
#endregion
|
|
|
|
|
|
+
|
|
|
+
|
|
|
#region 判断文件路径
|
|
|
/// <summary>
|
|
|
/// 判断文件路径
|
|
@@ -507,7 +519,6 @@ namespace OTSSysMgrApp
|
|
|
return false;
|
|
|
}
|
|
|
#endregion
|
|
|
-
|
|
|
#region 判断文件是否存在
|
|
|
/// <summary>
|
|
|
/// 判断文件是否存在
|
|
@@ -660,7 +671,14 @@ namespace OTSSysMgrApp
|
|
|
}
|
|
|
else if (radioButton_CleannessA.Checked)
|
|
|
{
|
|
|
- Type = "CleannessA";
|
|
|
+ if (coB_CleannessType.SelectedItem.ToString() == "TCCleannessA")
|
|
|
+ {
|
|
|
+ Type = "TCCleannessA";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ Type = "BatteryCleannessA";
|
|
|
+ }
|
|
|
}
|
|
|
bool result = XMLOperationClass.WriteSysType(path, "SysType", Type);
|
|
|
string path2 = Application.StartupPath + @"\Config\SysData\OTSReportMgrParam.rpf";
|