比对修改分析数据图右侧的计算方式，1.5版本没有此功能，现没实现暂时隐藏

OTSIncAReportApp/FunctionClass/OTSDataMgrFunction/DataMgrFun.cs

@@ -915,10 +915,10 @@ namespace OTSIncAReportApp.OTSDataMgrFunction
                         }
                         break;
                     default:
-                        if (!list_showgrid_item.Contains(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE))//13
-                        {
-                            list_showgrid_item.Add(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
-                        }
+                        //if (!list_showgrid_item.Contains(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE))//13
+                        //{
+                        //    list_showgrid_item.Add(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
+                        //}
                         list_showgrid_item.Remove(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE);
                         list_showgrid_item.Remove(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE);//15
                         break;
@@ -1055,8 +1055,9 @@ namespace OTSIncAReportApp.OTSDataMgrFunction
                 //data2.TSampleParam.sSampleTitleName = ",0,1,6,";
                 data2.TSampleParam.List_ShowGrid_Items = new List<OTS_REPORT_PROP_GRID_ITEMS> { OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE,//0
                     OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE,//1
-                    OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE,//6
-                    OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE};//13
+                    OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE };
+                    //,//6
+                    //OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE};//13
                 data2.SampleDataList = GetSourceGridData(2);
                 m_ReportApp.SourceGridDataList.Add(data2);
                 m_ReportApp.SourceGridDataListLog.Add(data2);

OTSIncAReportApp/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.Designer.cs

@@ -89,9 +89,9 @@
             this.ck_ysfx_xsmk = new System.Windows.Forms.CheckBox();
             this.label25 = new System.Windows.Forms.Label();
             this.cb_ysfx_klfw = new System.Windows.Forms.ComboBox();
-            this.cb_yxfx_jsfs = new System.Windows.Forms.ComboBox();
             this.label26 = new System.Windows.Forms.Label();
             this.label27 = new System.Windows.Forms.Label();
+            this.cb_yxfx_jsfs = new System.Windows.Forms.ComboBox();
             this.label28 = new System.Windows.Forms.Label();
             this.groupBox7 = new System.Windows.Forms.GroupBox();
             this.lbv_syxt_mblb = new System.Windows.Forms.ListView();
@@ -164,7 +164,7 @@
             // tb_FBT
             // 
             this.tb_FBT.Location = new System.Drawing.Point(5, 83);
-            this.tb_FBT.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_FBT.Margin = new System.Windows.Forms.Padding(2);
             this.tb_FBT.Name = "tb_FBT";
             this.tb_FBT.Size = new System.Drawing.Size(258, 21);
             this.tb_FBT.TabIndex = 20;
@@ -172,7 +172,7 @@
             // tb_ZBT
             // 
             this.tb_ZBT.Location = new System.Drawing.Point(5, 35);
-            this.tb_ZBT.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_ZBT.Margin = new System.Windows.Forms.Padding(2);
             this.tb_ZBT.Name = "tb_ZBT";
             this.tb_ZBT.Size = new System.Drawing.Size(258, 21);
             this.tb_ZBT.TabIndex = 10;
@@ -200,7 +200,7 @@
             // button1
             // 
             this.button1.Location = new System.Drawing.Point(930, 47);
-            this.button1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(71, 22);
             this.button1.TabIndex = 60;
@@ -211,7 +211,7 @@
             // button2
             // 
             this.button2.Location = new System.Drawing.Point(1376, 648);
-            this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button2.Margin = new System.Windows.Forms.Padding(2);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(71, 22);
             this.button2.TabIndex = 70;
@@ -232,7 +232,7 @@
             // tb_YPBH
             // 
             this.tb_YPBH.Location = new System.Drawing.Point(5, 138);
-            this.tb_YPBH.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_YPBH.Margin = new System.Windows.Forms.Padding(2);
             this.tb_YPBH.Name = "tb_YPBH";
             this.tb_YPBH.Size = new System.Drawing.Size(258, 21);
             this.tb_YPBH.TabIndex = 30;
@@ -250,7 +250,7 @@
             // tb_CKBZ
             // 
             this.tb_CKBZ.Location = new System.Drawing.Point(5, 189);
-            this.tb_CKBZ.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_CKBZ.Margin = new System.Windows.Forms.Padding(2);
             this.tb_CKBZ.Name = "tb_CKBZ";
             this.tb_CKBZ.Size = new System.Drawing.Size(258, 21);
             this.tb_CKBZ.TabIndex = 50;
@@ -259,7 +259,7 @@
             // 
             this.ck_jggk.AutoSize = true;
             this.ck_jggk.Location = new System.Drawing.Point(224, 230);
-            this.ck_jggk.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ck_jggk.Margin = new System.Windows.Forms.Padding(2);
             this.ck_jggk.Name = "ck_jggk";
             this.ck_jggk.Size = new System.Drawing.Size(15, 14);
             this.ck_jggk.TabIndex = 51;
@@ -269,7 +269,7 @@
             // 
             this.ck_ypsm.AutoSize = true;
             this.ck_ypsm.Location = new System.Drawing.Point(388, 159);
-            this.ck_ypsm.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ck_ypsm.Margin = new System.Windows.Forms.Padding(2);
             this.ck_ypsm.Name = "ck_ypsm";
             this.ck_ypsm.Size = new System.Drawing.Size(15, 14);
             this.ck_ypsm.TabIndex = 51;
@@ -299,7 +299,7 @@
             // 
             this.ck_ym.AutoSize = true;
             this.ck_ym.Location = new System.Drawing.Point(409, 89);
-            this.ck_ym.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ck_ym.Margin = new System.Windows.Forms.Padding(2);
             this.ck_ym.Name = "ck_ym";
             this.ck_ym.Size = new System.Drawing.Size(15, 14);
             this.ck_ym.TabIndex = 52;
@@ -308,7 +308,7 @@
             // tb_yjwb
             // 
             this.tb_yjwb.Location = new System.Drawing.Point(7, 89);
-            this.tb_yjwb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_yjwb.Margin = new System.Windows.Forms.Padding(2);
             this.tb_yjwb.Name = "tb_yjwb";
             this.tb_yjwb.Size = new System.Drawing.Size(256, 21);
             this.tb_yjwb.TabIndex = 42;
@@ -336,7 +336,7 @@
             // tb_khh
             // 
             this.tb_khh.Location = new System.Drawing.Point(7, 147);
-            this.tb_khh.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_khh.Margin = new System.Windows.Forms.Padding(2);
             this.tb_khh.Name = "tb_khh";
             this.tb_khh.Size = new System.Drawing.Size(256, 21);
             this.tb_khh.TabIndex = 42;
@@ -362,9 +362,9 @@
             this.groupBox1.Controls.Add(this.label10);
             this.groupBox1.Controls.Add(this.label8);
             this.groupBox1.Location = new System.Drawing.Point(3, 263);
-            this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
             this.groupBox1.Size = new System.Drawing.Size(268, 181);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
@@ -373,7 +373,7 @@
             // tb_ymwb
             // 
             this.tb_ymwb.Location = new System.Drawing.Point(7, 33);
-            this.tb_ymwb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_ymwb.Margin = new System.Windows.Forms.Padding(2);
             this.tb_ymwb.Name = "tb_ymwb";
             this.tb_ymwb.Size = new System.Drawing.Size(256, 21);
             this.tb_ymwb.TabIndex = 42;
@@ -396,14 +396,14 @@
             this.groupBox3.Controls.Add(this.label13);
             this.groupBox3.Controls.Add(this.cb_jzwfl_ljb);
             this.groupBox3.Controls.Add(this.label19);
-            this.groupBox3.Controls.Add(this.label11);
             this.groupBox3.Controls.Add(this.cb_jzwfl_xstx);
-            this.groupBox3.Controls.Add(this.cb_jzwfl_jsfs);
             this.groupBox3.Controls.Add(this.label12);
+            this.groupBox3.Controls.Add(this.label11);
+            this.groupBox3.Controls.Add(this.cb_jzwfl_jsfs);
             this.groupBox3.Location = new System.Drawing.Point(3, 648);
-            this.groupBox3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox3.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox3.Padding = new System.Windows.Forms.Padding(2);
             this.groupBox3.Size = new System.Drawing.Size(268, 251);
             this.groupBox3.TabIndex = 1;
             this.groupBox3.TabStop = false;
@@ -413,7 +413,7 @@
             // 
             this.cb_jzwfl_xsmk.AutoSize = true;
             this.cb_jzwfl_xsmk.Location = new System.Drawing.Point(224, 18);
-            this.cb_jzwfl_xsmk.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_jzwfl_xsmk.Margin = new System.Windows.Forms.Padding(2);
             this.cb_jzwfl_xsmk.Name = "cb_jzwfl_xsmk";
             this.cb_jzwfl_xsmk.Size = new System.Drawing.Size(15, 14);
             this.cb_jzwfl_xsmk.TabIndex = 53;
@@ -435,7 +435,7 @@
             this.cb_jzwfl_klfw.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_jzwfl_klfw.FormattingEnabled = true;
             this.cb_jzwfl_klfw.Location = new System.Drawing.Point(19, 219);
-            this.cb_jzwfl_klfw.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_jzwfl_klfw.Margin = new System.Windows.Forms.Padding(2);
             this.cb_jzwfl_klfw.Name = "cb_jzwfl_klfw";
             this.cb_jzwfl_klfw.Size = new System.Drawing.Size(216, 20);
             this.cb_jzwfl_klfw.TabIndex = 42;
@@ -454,8 +454,8 @@
             // 
             this.cb_jzwfl_ljb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_jzwfl_ljb.FormattingEnabled = true;
-            this.cb_jzwfl_ljb.Location = new System.Drawing.Point(19, 164);
-            this.cb_jzwfl_ljb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_jzwfl_ljb.Location = new System.Drawing.Point(19, 139);
+            this.cb_jzwfl_ljb.Margin = new System.Windows.Forms.Padding(2);
             this.cb_jzwfl_ljb.Name = "cb_jzwfl_ljb";
             this.cb_jzwfl_ljb.Size = new System.Drawing.Size(216, 20);
             this.cb_jzwfl_ljb.TabIndex = 42;
@@ -479,13 +479,14 @@
             this.label11.Size = new System.Drawing.Size(53, 12);
             this.label11.TabIndex = 41;
             this.label11.Text = "计算方式";
+            this.label11.Visible = false;
             // 
             // cb_jzwfl_xstx
             // 
             this.cb_jzwfl_xstx.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_jzwfl_xstx.FormattingEnabled = true;
             this.cb_jzwfl_xstx.Location = new System.Drawing.Point(19, 61);
-            this.cb_jzwfl_xstx.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_jzwfl_xstx.Margin = new System.Windows.Forms.Padding(2);
             this.cb_jzwfl_xstx.Name = "cb_jzwfl_xstx";
             this.cb_jzwfl_xstx.Size = new System.Drawing.Size(216, 20);
             this.cb_jzwfl_xstx.TabIndex = 42;
@@ -495,15 +496,16 @@
             this.cb_jzwfl_jsfs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_jzwfl_jsfs.FormattingEnabled = true;
             this.cb_jzwfl_jsfs.Location = new System.Drawing.Point(19, 110);
-            this.cb_jzwfl_jsfs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_jzwfl_jsfs.Margin = new System.Windows.Forms.Padding(2);
             this.cb_jzwfl_jsfs.Name = "cb_jzwfl_jsfs";
             this.cb_jzwfl_jsfs.Size = new System.Drawing.Size(216, 20);
             this.cb_jzwfl_jsfs.TabIndex = 42;
+            this.cb_jzwfl_jsfs.Visible = false;
             // 
             // label12
             // 
             this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(17, 150);
+            this.label12.Location = new System.Drawing.Point(17, 125);
             this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(65, 12);
@@ -521,9 +523,9 @@
             this.groupBox4.Controls.Add(this.label15);
             this.groupBox4.Controls.Add(this.label14);
             this.groupBox4.Location = new System.Drawing.Point(3, 448);
-            this.groupBox4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox4.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox4.Padding = new System.Windows.Forms.Padding(2);
             this.groupBox4.Size = new System.Drawing.Size(268, 196);
             this.groupBox4.TabIndex = 2;
             this.groupBox4.TabStop = false;
@@ -533,7 +535,7 @@
             // 
             this.ck_klcc_xsmk.AutoSize = true;
             this.ck_klcc_xsmk.Location = new System.Drawing.Point(224, 25);
-            this.ck_klcc_xsmk.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ck_klcc_xsmk.Margin = new System.Windows.Forms.Padding(2);
             this.ck_klcc_xsmk.Name = "ck_klcc_xsmk";
             this.ck_klcc_xsmk.Size = new System.Drawing.Size(15, 14);
             this.ck_klcc_xsmk.TabIndex = 53;
@@ -555,7 +557,7 @@
             this.cb_klcc_klfw.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_klcc_klfw.FormattingEnabled = true;
             this.cb_klcc_klfw.Location = new System.Drawing.Point(19, 161);
-            this.cb_klcc_klfw.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_klcc_klfw.Margin = new System.Windows.Forms.Padding(2);
             this.cb_klcc_klfw.Name = "cb_klcc_klfw";
             this.cb_klcc_klfw.Size = new System.Drawing.Size(216, 20);
             this.cb_klcc_klfw.TabIndex = 42;
@@ -565,7 +567,7 @@
             this.cb_klcc_ljb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_klcc_ljb.FormattingEnabled = true;
             this.cb_klcc_ljb.Location = new System.Drawing.Point(19, 112);
-            this.cb_klcc_ljb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_klcc_ljb.Margin = new System.Windows.Forms.Padding(2);
             this.cb_klcc_ljb.Name = "cb_klcc_ljb";
             this.cb_klcc_ljb.Size = new System.Drawing.Size(216, 20);
             this.cb_klcc_ljb.TabIndex = 42;
@@ -575,7 +577,7 @@
             this.cb_klcc_jsfs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_klcc_jsfs.FormattingEnabled = true;
             this.cb_klcc_jsfs.Location = new System.Drawing.Point(19, 67);
-            this.cb_klcc_jsfs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_klcc_jsfs.Margin = new System.Windows.Forms.Padding(2);
             this.cb_klcc_jsfs.Name = "cb_klcc_jsfs";
             this.cb_klcc_jsfs.Size = new System.Drawing.Size(216, 20);
             this.cb_klcc_jsfs.TabIndex = 42;
@@ -624,9 +626,9 @@
             this.groupBox5.Controls.Add(this.cb_yscf_jsfs);
             this.groupBox5.Controls.Add(this.label24);
             this.groupBox5.Location = new System.Drawing.Point(8, 1119);
-            this.groupBox5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox5.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox5.Padding = new System.Windows.Forms.Padding(2);
             this.groupBox5.Size = new System.Drawing.Size(263, 263);
             this.groupBox5.TabIndex = 3;
             this.groupBox5.TabStop = false;
@@ -635,7 +637,7 @@
             // button5
             // 
             this.button5.Location = new System.Drawing.Point(193, 224);
-            this.button5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button5.Margin = new System.Windows.Forms.Padding(2);
             this.button5.Name = "button5";
             this.button5.Size = new System.Drawing.Size(37, 19);
             this.button5.TabIndex = 56;
@@ -646,7 +648,7 @@
             // tb_yscf_ysxx
             // 
             this.tb_yscf_ysxx.Location = new System.Drawing.Point(16, 222);
-            this.tb_yscf_ysxx.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_yscf_ysxx.Margin = new System.Windows.Forms.Padding(2);
             this.tb_yscf_ysxx.Name = "tb_yscf_ysxx";
             this.tb_yscf_ysxx.ReadOnly = true;
             this.tb_yscf_ysxx.Size = new System.Drawing.Size(173, 21);
@@ -656,7 +658,7 @@
             // 
             this.ck_yscf_xsmk.AutoSize = true;
             this.ck_yscf_xsmk.Location = new System.Drawing.Point(224, 18);
-            this.ck_yscf_xsmk.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ck_yscf_xsmk.Margin = new System.Windows.Forms.Padding(2);
             this.ck_yscf_xsmk.Name = "ck_yscf_xsmk";
             this.ck_yscf_xsmk.Size = new System.Drawing.Size(15, 14);
             this.ck_yscf_xsmk.TabIndex = 53;
@@ -677,8 +679,8 @@
             // 
             this.cb_yscf_klfw.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_yscf_klfw.FormattingEnabled = true;
-            this.cb_yscf_klfw.Location = new System.Drawing.Point(16, 166);
-            this.cb_yscf_klfw.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_yscf_klfw.Location = new System.Drawing.Point(16, 134);
+            this.cb_yscf_klfw.Margin = new System.Windows.Forms.Padding(2);
             this.cb_yscf_klfw.Name = "cb_yscf_klfw";
             this.cb_yscf_klfw.Size = new System.Drawing.Size(214, 20);
             this.cb_yscf_klfw.TabIndex = 42;
@@ -686,7 +688,7 @@
             // label21
             // 
             this.label21.AutoSize = true;
-            this.label21.Location = new System.Drawing.Point(14, 152);
+            this.label21.Location = new System.Drawing.Point(14, 120);
             this.label21.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label21.Name = "label21";
             this.label21.Size = new System.Drawing.Size(53, 12);
@@ -712,13 +714,14 @@
             this.label23.Size = new System.Drawing.Size(53, 12);
             this.label23.TabIndex = 41;
             this.label23.Text = "计算方式";
+            this.label23.Visible = false;
             // 
             // cb_yscf_xstx
             // 
             this.cb_yscf_xstx.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_yscf_xstx.FormattingEnabled = true;
             this.cb_yscf_xstx.Location = new System.Drawing.Point(16, 59);
-            this.cb_yscf_xstx.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_yscf_xstx.Margin = new System.Windows.Forms.Padding(2);
             this.cb_yscf_xstx.Name = "cb_yscf_xstx";
             this.cb_yscf_xstx.Size = new System.Drawing.Size(214, 20);
             this.cb_yscf_xstx.TabIndex = 42;
@@ -728,10 +731,11 @@
             this.cb_yscf_jsfs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_yscf_jsfs.FormattingEnabled = true;
             this.cb_yscf_jsfs.Location = new System.Drawing.Point(16, 110);
-            this.cb_yscf_jsfs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_yscf_jsfs.Margin = new System.Windows.Forms.Padding(2);
             this.cb_yscf_jsfs.Name = "cb_yscf_jsfs";
             this.cb_yscf_jsfs.Size = new System.Drawing.Size(214, 20);
             this.cb_yscf_jsfs.TabIndex = 42;
+            this.cb_yscf_jsfs.Visible = false;
             // 
             // label24
             // 
@@ -755,9 +759,9 @@
             this.groupBox6.Controls.Add(this.cb_yxfx_jsfs);
             this.groupBox6.Controls.Add(this.label28);
             this.groupBox6.Location = new System.Drawing.Point(3, 903);
-            this.groupBox6.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox6.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox6.Padding = new System.Windows.Forms.Padding(2);
             this.groupBox6.Size = new System.Drawing.Size(268, 212);
             this.groupBox6.TabIndex = 4;
             this.groupBox6.TabStop = false;
@@ -766,7 +770,7 @@
             // button4
             // 
             this.button4.Location = new System.Drawing.Point(198, 143);
-            this.button4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button4.Margin = new System.Windows.Forms.Padding(2);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(37, 19);
             this.button4.TabIndex = 56;
@@ -777,7 +781,7 @@
             // tb_ysfx_xsys
             // 
             this.tb_ysfx_xsys.Location = new System.Drawing.Point(21, 143);
-            this.tb_ysfx_xsys.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_ysfx_xsys.Margin = new System.Windows.Forms.Padding(2);
             this.tb_ysfx_xsys.Name = "tb_ysfx_xsys";
             this.tb_ysfx_xsys.ReadOnly = true;
             this.tb_ysfx_xsys.Size = new System.Drawing.Size(173, 21);
@@ -787,7 +791,7 @@
             // 
             this.ck_ysfx_xsmk.AutoSize = true;
             this.ck_ysfx_xsmk.Location = new System.Drawing.Point(224, 25);
-            this.ck_ysfx_xsmk.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ck_ysfx_xsmk.Margin = new System.Windows.Forms.Padding(2);
             this.ck_ysfx_xsmk.Name = "ck_ysfx_xsmk";
             this.ck_ysfx_xsmk.Size = new System.Drawing.Size(15, 14);
             this.ck_ysfx_xsmk.TabIndex = 53;
@@ -809,22 +813,11 @@
             this.cb_ysfx_klfw.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_ysfx_klfw.FormattingEnabled = true;
             this.cb_ysfx_klfw.Location = new System.Drawing.Point(21, 89);
-            this.cb_ysfx_klfw.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_ysfx_klfw.Margin = new System.Windows.Forms.Padding(2);
             this.cb_ysfx_klfw.Name = "cb_ysfx_klfw";
             this.cb_ysfx_klfw.Size = new System.Drawing.Size(214, 20);
             this.cb_ysfx_klfw.TabIndex = 42;
             // 
-            // cb_yxfx_jsfs
-            // 
-            this.cb_yxfx_jsfs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cb_yxfx_jsfs.FormattingEnabled = true;
-            this.cb_yxfx_jsfs.Location = new System.Drawing.Point(21, 65);
-            this.cb_yxfx_jsfs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.cb_yxfx_jsfs.Name = "cb_yxfx_jsfs";
-            this.cb_yxfx_jsfs.Size = new System.Drawing.Size(214, 20);
-            this.cb_yxfx_jsfs.TabIndex = 42;
-            this.cb_yxfx_jsfs.Visible = false;
-            // 
             // label26
             // 
             this.label26.AutoSize = true;
@@ -845,6 +838,17 @@
             this.label27.TabIndex = 41;
             this.label27.Text = "显示元素";
             // 
+            // cb_yxfx_jsfs
+            // 
+            this.cb_yxfx_jsfs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cb_yxfx_jsfs.FormattingEnabled = true;
+            this.cb_yxfx_jsfs.Location = new System.Drawing.Point(21, 65);
+            this.cb_yxfx_jsfs.Margin = new System.Windows.Forms.Padding(2);
+            this.cb_yxfx_jsfs.Name = "cb_yxfx_jsfs";
+            this.cb_yxfx_jsfs.Size = new System.Drawing.Size(214, 20);
+            this.cb_yxfx_jsfs.TabIndex = 42;
+            this.cb_yxfx_jsfs.Visible = false;
+            // 
             // label28
             // 
             this.label28.AutoSize = true;
@@ -858,22 +862,22 @@
             // 
             // groupBox7
             // 
+            this.groupBox7.Controls.Add(this.cb_syxt_klfw);
+            this.groupBox7.Controls.Add(this.label41);
             this.groupBox7.Controls.Add(this.lbv_syxt_mblb);
             this.groupBox7.Controls.Add(this.ck_syxt_xsmk);
             this.groupBox7.Controls.Add(this.label40);
             this.groupBox7.Controls.Add(this.cb_syxt_ljb);
             this.groupBox7.Controls.Add(this.cb_syxt_mhxssl);
-            this.groupBox7.Controls.Add(this.cb_syxt_klfw);
-            this.groupBox7.Controls.Add(this.cb_syxt_jsfs);
-            this.groupBox7.Controls.Add(this.label41);
             this.groupBox7.Controls.Add(this.label38);
             this.groupBox7.Controls.Add(this.label33);
             this.groupBox7.Controls.Add(this.label42);
+            this.groupBox7.Controls.Add(this.cb_syxt_jsfs);
             this.groupBox7.Controls.Add(this.label44);
             this.groupBox7.Location = new System.Drawing.Point(8, 1386);
-            this.groupBox7.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox7.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox7.Name = "groupBox7";
-            this.groupBox7.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox7.Padding = new System.Windows.Forms.Padding(2);
             this.groupBox7.Size = new System.Drawing.Size(263, 531);
             this.groupBox7.TabIndex = 7;
             this.groupBox7.TabStop = false;
@@ -885,7 +889,7 @@
             this.lbv_syxt_mblb.FullRowSelect = true;
             this.lbv_syxt_mblb.HideSelection = false;
             this.lbv_syxt_mblb.Location = new System.Drawing.Point(6, 269);
-            this.lbv_syxt_mblb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.lbv_syxt_mblb.Margin = new System.Windows.Forms.Padding(2);
             this.lbv_syxt_mblb.Name = "lbv_syxt_mblb";
             this.lbv_syxt_mblb.Size = new System.Drawing.Size(249, 258);
             this.lbv_syxt_mblb.TabIndex = 55;
@@ -896,7 +900,7 @@
             // 
             this.ck_syxt_xsmk.AutoSize = true;
             this.ck_syxt_xsmk.Location = new System.Drawing.Point(224, 21);
-            this.ck_syxt_xsmk.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ck_syxt_xsmk.Margin = new System.Windows.Forms.Padding(2);
             this.ck_syxt_xsmk.Name = "ck_syxt_xsmk";
             this.ck_syxt_xsmk.Size = new System.Drawing.Size(15, 14);
             this.ck_syxt_xsmk.TabIndex = 53;
@@ -917,8 +921,8 @@
             // 
             this.cb_syxt_ljb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_syxt_ljb.FormattingEnabled = true;
-            this.cb_syxt_ljb.Location = new System.Drawing.Point(16, 162);
-            this.cb_syxt_ljb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_syxt_ljb.Location = new System.Drawing.Point(14, 144);
+            this.cb_syxt_ljb.Margin = new System.Windows.Forms.Padding(2);
             this.cb_syxt_ljb.Name = "cb_syxt_ljb";
             this.cb_syxt_ljb.Size = new System.Drawing.Size(214, 20);
             this.cb_syxt_ljb.TabIndex = 42;
@@ -928,7 +932,7 @@
             this.cb_syxt_mhxssl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_syxt_mhxssl.FormattingEnabled = true;
             this.cb_syxt_mhxssl.Location = new System.Drawing.Point(16, 212);
-            this.cb_syxt_mhxssl.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_syxt_mhxssl.Margin = new System.Windows.Forms.Padding(2);
             this.cb_syxt_mhxssl.Name = "cb_syxt_mhxssl";
             this.cb_syxt_mhxssl.Size = new System.Drawing.Size(214, 20);
             this.cb_syxt_mhxssl.TabIndex = 42;
@@ -938,8 +942,8 @@
             // 
             this.cb_syxt_klfw.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_syxt_klfw.FormattingEnabled = true;
-            this.cb_syxt_klfw.Location = new System.Drawing.Point(16, 112);
-            this.cb_syxt_klfw.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_syxt_klfw.Location = new System.Drawing.Point(16, 77);
+            this.cb_syxt_klfw.Margin = new System.Windows.Forms.Padding(2);
             this.cb_syxt_klfw.Name = "cb_syxt_klfw";
             this.cb_syxt_klfw.Size = new System.Drawing.Size(214, 20);
             this.cb_syxt_klfw.TabIndex = 42;
@@ -949,15 +953,16 @@
             this.cb_syxt_jsfs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_syxt_jsfs.FormattingEnabled = true;
             this.cb_syxt_jsfs.Location = new System.Drawing.Point(16, 62);
-            this.cb_syxt_jsfs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_syxt_jsfs.Margin = new System.Windows.Forms.Padding(2);
             this.cb_syxt_jsfs.Name = "cb_syxt_jsfs";
             this.cb_syxt_jsfs.Size = new System.Drawing.Size(214, 20);
             this.cb_syxt_jsfs.TabIndex = 42;
+            this.cb_syxt_jsfs.Visible = false;
             // 
             // label41
             // 
             this.label41.AutoSize = true;
-            this.label41.Location = new System.Drawing.Point(14, 98);
+            this.label41.Location = new System.Drawing.Point(14, 63);
             this.label41.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label41.Name = "label41";
             this.label41.Size = new System.Drawing.Size(53, 12);
@@ -967,7 +972,7 @@
             // label38
             // 
             this.label38.AutoSize = true;
-            this.label38.Location = new System.Drawing.Point(14, 148);
+            this.label38.Location = new System.Drawing.Point(12, 130);
             this.label38.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label38.Name = "label38";
             this.label38.Size = new System.Drawing.Size(65, 12);
@@ -1003,6 +1008,7 @@
             this.label44.Size = new System.Drawing.Size(53, 12);
             this.label44.TabIndex = 41;
             this.label44.Text = "计算方式";
+            this.label44.Visible = false;
             // 
             // groupBox8
             // 
@@ -1024,9 +1030,9 @@
             this.groupBox8.Controls.Add(this.label36);
             this.groupBox8.Controls.Add(this.label37);
             this.groupBox8.Location = new System.Drawing.Point(8, 1921);
-            this.groupBox8.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox8.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox8.Name = "groupBox8";
-            this.groupBox8.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox8.Padding = new System.Windows.Forms.Padding(2);
             this.groupBox8.Size = new System.Drawing.Size(263, 352);
             this.groupBox8.TabIndex = 6;
             this.groupBox8.TabStop = false;
@@ -1035,7 +1041,7 @@
             // button3
             // 
             this.button3.Location = new System.Drawing.Point(193, 213);
-            this.button3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button3.Margin = new System.Windows.Forms.Padding(2);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(37, 19);
             this.button3.TabIndex = 55;
@@ -1047,7 +1053,7 @@
             // tb_kllb_ylsx
             // 
             this.tb_kllb_ylsx.Location = new System.Drawing.Point(16, 159);
-            this.tb_kllb_ylsx.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_kllb_ylsx.Margin = new System.Windows.Forms.Padding(2);
             this.tb_kllb_ylsx.Name = "tb_kllb_ylsx";
             this.tb_kllb_ylsx.Size = new System.Drawing.Size(214, 21);
             this.tb_kllb_ylsx.TabIndex = 54;
@@ -1055,7 +1061,7 @@
             // tb_kllb_sxys
             // 
             this.tb_kllb_sxys.Location = new System.Drawing.Point(16, 211);
-            this.tb_kllb_sxys.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_kllb_sxys.Margin = new System.Windows.Forms.Padding(2);
             this.tb_kllb_sxys.Name = "tb_kllb_sxys";
             this.tb_kllb_sxys.ReadOnly = true;
             this.tb_kllb_sxys.Size = new System.Drawing.Size(173, 21);
@@ -1065,8 +1071,8 @@
             // ck_kllb_npxx
             // 
             this.ck_kllb_npxx.AutoSize = true;
-            this.ck_kllb_npxx.Location = new System.Drawing.Point(224, 316);
-            this.ck_kllb_npxx.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ck_kllb_npxx.Location = new System.Drawing.Point(224, 299);
+            this.ck_kllb_npxx.Margin = new System.Windows.Forms.Padding(2);
             this.ck_kllb_npxx.Name = "ck_kllb_npxx";
             this.ck_kllb_npxx.Size = new System.Drawing.Size(15, 14);
             this.ck_kllb_npxx.TabIndex = 53;
@@ -1076,8 +1082,8 @@
             // ck_kllb_fdtx
             // 
             this.ck_kllb_fdtx.AutoSize = true;
-            this.ck_kllb_fdtx.Location = new System.Drawing.Point(224, 290);
-            this.ck_kllb_fdtx.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ck_kllb_fdtx.Location = new System.Drawing.Point(224, 273);
+            this.ck_kllb_fdtx.Margin = new System.Windows.Forms.Padding(2);
             this.ck_kllb_fdtx.Name = "ck_kllb_fdtx";
             this.ck_kllb_fdtx.Size = new System.Drawing.Size(15, 14);
             this.ck_kllb_fdtx.TabIndex = 53;
@@ -1087,8 +1093,8 @@
             // ck_kllb_ystx
             // 
             this.ck_kllb_ystx.AutoSize = true;
-            this.ck_kllb_ystx.Location = new System.Drawing.Point(224, 264);
-            this.ck_kllb_ystx.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ck_kllb_ystx.Location = new System.Drawing.Point(224, 247);
+            this.ck_kllb_ystx.Margin = new System.Windows.Forms.Padding(2);
             this.ck_kllb_ystx.Name = "ck_kllb_ystx";
             this.ck_kllb_ystx.Size = new System.Drawing.Size(15, 14);
             this.ck_kllb_ystx.TabIndex = 53;
@@ -1099,7 +1105,7 @@
             // 
             this.ck_kllb_xsmk.AutoSize = true;
             this.ck_kllb_xsmk.Location = new System.Drawing.Point(224, 23);
-            this.ck_kllb_xsmk.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ck_kllb_xsmk.Margin = new System.Windows.Forms.Padding(2);
             this.ck_kllb_xsmk.Name = "ck_kllb_xsmk";
             this.ck_kllb_xsmk.Size = new System.Drawing.Size(15, 14);
             this.ck_kllb_xsmk.TabIndex = 53;
@@ -1109,7 +1115,7 @@
             // label32
             // 
             this.label32.AutoSize = true;
-            this.label32.Location = new System.Drawing.Point(16, 318);
+            this.label32.Location = new System.Drawing.Point(16, 301);
             this.label32.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label32.Name = "label32";
             this.label32.Size = new System.Drawing.Size(53, 12);
@@ -1119,7 +1125,7 @@
             // label31
             // 
             this.label31.AutoSize = true;
-            this.label31.Location = new System.Drawing.Point(14, 292);
+            this.label31.Location = new System.Drawing.Point(14, 275);
             this.label31.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label31.Name = "label31";
             this.label31.Size = new System.Drawing.Size(53, 12);
@@ -1129,7 +1135,7 @@
             // label30
             // 
             this.label30.AutoSize = true;
-            this.label30.Location = new System.Drawing.Point(14, 266);
+            this.label30.Location = new System.Drawing.Point(14, 249);
             this.label30.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label30.Name = "label30";
             this.label30.Size = new System.Drawing.Size(53, 12);
@@ -1151,7 +1157,7 @@
             this.cb_kllb_klfw.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_kllb_klfw.FormattingEnabled = true;
             this.cb_kllb_klfw.Location = new System.Drawing.Point(16, 109);
-            this.cb_kllb_klfw.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_kllb_klfw.Margin = new System.Windows.Forms.Padding(2);
             this.cb_kllb_klfw.Name = "cb_kllb_klfw";
             this.cb_kllb_klfw.Size = new System.Drawing.Size(214, 20);
             this.cb_kllb_klfw.TabIndex = 42;
@@ -1161,7 +1167,7 @@
             this.cb_kllb_jsfs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_kllb_jsfs.FormattingEnabled = true;
             this.cb_kllb_jsfs.Location = new System.Drawing.Point(16, 62);
-            this.cb_kllb_jsfs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_kllb_jsfs.Margin = new System.Windows.Forms.Padding(2);
             this.cb_kllb_jsfs.Name = "cb_kllb_jsfs";
             this.cb_kllb_jsfs.Size = new System.Drawing.Size(214, 20);
             this.cb_kllb_jsfs.TabIndex = 42;
@@ -1210,7 +1216,7 @@
             // button6
             // 
             this.button6.Location = new System.Drawing.Point(855, 47);
-            this.button6.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button6.Margin = new System.Windows.Forms.Padding(2);
             this.button6.Name = "button6";
             this.button6.Size = new System.Drawing.Size(71, 22);
             this.button6.TabIndex = 72;
@@ -1421,7 +1427,7 @@
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.button2);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "OTSReport_TemplateDesignerRM";