Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev

OTSIncAReportApp/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -314,77 +314,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     dr["ColName6"] = list_max_elementname[5];
                     dr["ColVal6"] = list_max_elementvale[5].ToString();
 
-                    ////找第1个元素
-                    //if (str_element.Split(';').Count() > 0 && str_element.Split(';')[0] != "")
-                    //{
-                    //    dr["ColName1"] = str_element.Split(';')[0].Split('-')[0];
-                    //    dr["ColVal1"] = Math.Round(Convert.ToDouble(str_element.Split(';')[0].Split('-')[1]), 3);
-                    //}
-                    //else
-                    //{
-                    //    dr["ColName1"] = "";
-                    //    dr["ColVal1"] = "";
-                    //}
-
-                    ////找第2个元素
-                    //if (str_element.Split(';').Count() > 1 && str_element.Split(';')[1] != "")
-                    //{
-                    //    dr["ColName2"] = str_element.Split(';')[1].Split('-')[0];
-                    //    dr["ColVal2"] = Math.Round(Convert.ToDouble(str_element.Split(';')[1].Split('-')[1]), 3);
-                    //}
-                    //else
-                    //{
-                    //    dr["ColName2"] = "";
-                    //    dr["ColVal2"] = "";
-                    //}
-
-                    ////找第3个元素
-                    //if (str_element.Split(';').Count() > 2 && str_element.Split(';')[2] != "")
-                    //{
-                    //    dr["ColName3"] = str_element.Split(';')[2].Split('-')[0];
-                    //    dr["ColVal3"] = Math.Round(Convert.ToDouble(str_element.Split(';')[2].Split('-')[1]), 3);
-                    //}
-                    //else
-                    //{
-                    //    dr["ColName3"] = "";
-                    //    dr["ColVal3"] = "";
-                    //}
-
-                    ////找第4个元素
-                    //if (str_element.Split(';').Count() > 3 && str_element.Split(';')[3] != "")
-                    //{
-                    //    dr["ColName4"] = str_element.Split(';')[3].Split('-')[0];
-                    //    dr["ColVal4"] = Math.Round(Convert.ToDouble(str_element.Split(';')[3].Split('-')[1]), 3);
-                    //}
-                    //else
-                    //{
-                    //    dr["ColName4"] = "";
-                    //    dr["ColVal4"] = "";
-                    //}
-
-                    ////找第5个元素
-                    //if (str_element.Split(';').Count() > 4 && str_element.Split(';')[4] != "")
-                    //{
-                    //    dr["ColName5"] = str_element.Split(';')[4].Split('-')[0];
-                    //    dr["ColVal5"] = Math.Round(Convert.ToDouble(str_element.Split(';')[4].Split('-')[1]), 3);
-                    //}
-                    //else
-                    //{
-                    //    dr["ColName5"] = "";
-                    //    dr["ColVal5"] = "";
-                    //}
-
-                    ////找第6个元素
-                    //if (str_element.Split(';').Count() > 5 && str_element.Split(';')[5] != "")
-                    //{
-                    //    dr["ColName6"] = str_element.Split(';')[5].Split('-')[0];
-                    //    dr["ColVal6"] = Math.Round(Convert.ToDouble(str_element.Split(';')[5].Split('-')[1]), 3);
-                    //}
-                    //else
-                    //{
-                    //    dr["ColName6"] = "";
-                    //    dr["ColVal6"] = "";
-                    //}
+                   
                     DT_Largest20.Rows.Add(dr);
                 }
             }
@@ -514,77 +444,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 dr["ColName6"] = list_max_elementname[5];
                 dr["ColVal6"] = list_max_elementvale[5].ToString();
 
-                ////找第1个元素
-                //if (str_element.Split(';').Count() > 0 && str_element.Split(';')[0] != "")
-                //{
-                //    dr["ColName1"] = str_element.Split(';')[0].Split('-')[0];
-                //    dr["ColVal1"] = Math.Round(Convert.ToDouble(str_element.Split(';')[0].Split('-')[1]), 3);
-                //}
-                //else
-                //{
-                //    dr["ColName1"] = "";
-                //    dr["ColVal1"] = "";
-                //}
-
-                ////找第2个元素
-                //if (str_element.Split(';').Count() > 1 && str_element.Split(';')[1] != "")
-                //{
-                //    dr["ColName2"] = str_element.Split(';')[1].Split('-')[0];
-                //    dr["ColVal2"] = Math.Round(Convert.ToDouble(str_element.Split(';')[1].Split('-')[1]), 3);
-                //}
-                //else
-                //{
-                //    dr["ColName2"] = "";
-                //    dr["ColVal2"] = "";
-                //}
-
-                ////找第3个元素
-                //if (str_element.Split(';').Count() > 2 && str_element.Split(';')[2] != "")
-                //{
-                //    dr["ColName3"] = str_element.Split(';')[2].Split('-')[0];
-                //    dr["ColVal3"] = Math.Round(Convert.ToDouble(str_element.Split(';')[2].Split('-')[1]), 3);
-                //}
-                //else
-                //{
-                //    dr["ColName3"] = "";
-                //    dr["ColVal3"] = "";
-                //}
-
-                ////找第4个元素
-                //if (str_element.Split(';').Count() > 3 && str_element.Split(';')[3] != "")
-                //{
-                //    dr["ColName4"] = str_element.Split(';')[3].Split('-')[0];
-                //    dr["ColVal4"] = Math.Round(Convert.ToDouble(str_element.Split(';')[3].Split('-')[1]), 3);
-                //}
-                //else
-                //{
-                //    dr["ColName4"] = "";
-                //    dr["ColVal4"] = "";
-                //}
-
-                ////找第5个元素
-                //if (str_element.Split(';').Count() > 4 && str_element.Split(';')[4] != "")
-                //{
-                //    dr["ColName5"] = str_element.Split(';')[4].Split('-')[0];
-                //    dr["ColVal5"] = Math.Round(Convert.ToDouble(str_element.Split(';')[4].Split('-')[1]), 3);
-                //}
-                //else
-                //{
-                //    dr["ColName5"] = "";
-                //    dr["ColVal5"] = "";
-                //}
-
-                ////找第6个元素
-                //if (str_element.Split(';').Count() > 5 && str_element.Split(';')[5] != "")
-                //{
-                //    dr["ColName6"] = str_element.Split(';')[5].Split('-')[0];
-                //    dr["ColVal6"] = Math.Round(Convert.ToDouble(str_element.Split(';')[5].Split('-')[1]), 3);
-                //}
-                //else
-                //{
-                //    dr["ColName6"] = "";
-                //    dr["ColVal6"] = "";
-                //}
+               
                 DT_Largest_frame.Rows.Add(dr);
             }
             #endregion

OTSIncAReportApp/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.Designer.cs

@@ -607,6 +607,7 @@
             this.button5.TabIndex = 56;
             this.button5.Text = "...";
             this.button5.UseVisualStyleBackColor = true;
+            this.button5.Visible = false;
             this.button5.Click += new System.EventHandler(this.button5_Click);
             // 
             // tb_yscf_ysxx
@@ -617,6 +618,7 @@
             this.tb_yscf_ysxx.ReadOnly = true;
             this.tb_yscf_ysxx.Size = new System.Drawing.Size(173, 21);
             this.tb_yscf_ysxx.TabIndex = 54;
+            this.tb_yscf_ysxx.Visible = false;
             // 
             // ck_yscf_xsmk
             // 
@@ -688,6 +690,7 @@
             this.label24.Size = new System.Drawing.Size(53, 12);
             this.label24.TabIndex = 41;
             this.label24.Text = "元素信息";
+            this.label24.Visible = false;
             // 
             // groupBox6
             // 

OTSIncAReportApp/frmReportApp.cs

@@ -11,6 +11,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
+using System.Diagnostics;
 using System.Windows.Forms;
 
 namespace OTSIncAReportApp
@@ -1186,6 +1187,7 @@ namespace OTSIncAReportApp
 
         private void frmReportApp_FormClosed(object sender, FormClosedEventArgs e)
         {
+            Process.GetCurrentProcess().Kill();
             this.Hide();//打开EChar图后，回收浏览器资源暂卡，为达到操作流畅性，先隐藏窗体再回收资源
             //m_DataMgrFun.DisposeCppObject();
             this.Invoke(new Action(() =>
@@ -1193,6 +1195,8 @@ namespace OTSIncAReportApp
                 if (Cef.IsInitialized)
                     Cef.Shutdown();
             }));
+
+            
         }