Начало Каталог Помощ
Регистрация Вход
gogsadmin
/
OTS
1
0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

调整报告界面结构减少中间空隙

zhangjiaxin преди 4 години
родител
7783c92351
ревизия
bbce047294
променени са 2 файла, в които са добавени 84 реда и са изтрити 222 реда
Разделен изглед Покажи статистика за разликите
  1. 64 202
      OTSIncAReportApp/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.Designer.cs
  2. 20 20
      OTSIncAReportApp/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.cs

+ 64 - 202
OTSIncAReportApp/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.Designer.cs
Целия файл 

@@ -58,9 +58,7 @@
 
             this.label13 = new System.Windows.Forms.Label();
 
             this.cb_jzwfl_ljb = new System.Windows.Forms.ComboBox();
 
             this.label19 = new System.Windows.Forms.Label();
 
-            this.label11 = new System.Windows.Forms.Label();
 
             this.cb_jzwfl_xstx = new System.Windows.Forms.ComboBox();
 
-            this.cb_jzwfl_jsfs = new System.Windows.Forms.ComboBox();
 
             this.label12 = new System.Windows.Forms.Label();
 
             this.groupBox4 = new System.Windows.Forms.GroupBox();
 
             this.ck_klcc_xsmk = new System.Windows.Forms.CheckBox();
 
@@ -79,9 +77,7 @@
 
             this.cb_yscf_klfw = new System.Windows.Forms.ComboBox();
 
             this.label21 = new System.Windows.Forms.Label();
 
             this.label22 = new System.Windows.Forms.Label();
 
-            this.label23 = new System.Windows.Forms.Label();
 
             this.cb_yscf_xstx = new System.Windows.Forms.ComboBox();
 
-            this.cb_yscf_jsfs = new System.Windows.Forms.ComboBox();
 
             this.label24 = new System.Windows.Forms.Label();
 
             this.groupBox6 = new System.Windows.Forms.GroupBox();
 
             this.button4 = new System.Windows.Forms.Button();
 
@@ -91,21 +87,17 @@
 
             this.cb_ysfx_klfw = 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.cb_syxt_klfw = new System.Windows.Forms.ComboBox();
 
+            this.label41 = new System.Windows.Forms.Label();
 
             this.lbv_syxt_mblb = new System.Windows.Forms.ListView();
 
             this.ck_syxt_xsmk = new System.Windows.Forms.CheckBox();
 
             this.label40 = new System.Windows.Forms.Label();
 
             this.cb_syxt_ljb = new System.Windows.Forms.ComboBox();
 
             this.cb_syxt_mhxssl = new System.Windows.Forms.ComboBox();
 
-            this.cb_syxt_klfw = new System.Windows.Forms.ComboBox();
 
-            this.cb_syxt_jsfs = new System.Windows.Forms.ComboBox();
 
-            this.label41 = new System.Windows.Forms.Label();
 
             this.label38 = new System.Windows.Forms.Label();
 
             this.label33 = new System.Windows.Forms.Label();
 
             this.label42 = new System.Windows.Forms.Label();
 
-            this.label44 = new System.Windows.Forms.Label();
 
             this.groupBox8 = new System.Windows.Forms.GroupBox();
 
             this.button3 = new System.Windows.Forms.Button();
 
             this.tb_kllb_ylsx = new System.Windows.Forms.TextBox();
 
@@ -119,11 +111,9 @@
 
             this.label30 = new System.Windows.Forms.Label();
 
             this.label34 = new System.Windows.Forms.Label();
 
             this.cb_kllb_klfw = new System.Windows.Forms.ComboBox();
 
-            this.cb_kllb_jsfs = new System.Windows.Forms.ComboBox();
 
             this.label35 = new System.Windows.Forms.Label();
 
             this.label29 = new System.Windows.Forms.Label();
 
             this.label36 = new System.Windows.Forms.Label();
 
-            this.label37 = new System.Windows.Forms.Label();
 
             this.button6 = new System.Windows.Forms.Button();
 
             this.panel2 = new System.Windows.Forms.Panel();
 
             this.label53 = new System.Windows.Forms.Label();
 
@@ -398,13 +388,11 @@
 
             this.groupBox3.Controls.Add(this.label19);
 
             this.groupBox3.Controls.Add(this.cb_jzwfl_xstx);
 
             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);
 
             this.groupBox3.Name = "groupBox3";
 
             this.groupBox3.Padding = new System.Windows.Forms.Padding(2);
 
-            this.groupBox3.Size = new System.Drawing.Size(268, 251);
 
+            this.groupBox3.Size = new System.Drawing.Size(268, 215);
 
             this.groupBox3.TabIndex = 1;
 
             this.groupBox3.TabStop = false;
 
             this.groupBox3.Text = "夹杂物分类图";
 
@@ -434,7 +422,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.Location = new System.Drawing.Point(19, 170);
 
             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);
 
@@ -443,7 +431,7 @@
 
             // label13
 
             // 
             this.label13.AutoSize = true;
 
-            this.label13.Location = new System.Drawing.Point(19, 201);
 
+            this.label13.Location = new System.Drawing.Point(19, 152);
 
             this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 
             this.label13.Name = "label13";
 
             this.label13.Size = new System.Drawing.Size(53, 12);
 
@@ -454,7 +442,7 @@
 
             // 
             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, 139);
 
+            this.cb_jzwfl_ljb.Location = new System.Drawing.Point(19, 112);
 
             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);
 
@@ -470,17 +458,6 @@
 
             this.label19.TabIndex = 41;
 
             this.label19.Text = "显示图形";
 
             // 
-            // label11
 
-            // 
-            this.label11.AutoSize = true;
 
-            this.label11.Location = new System.Drawing.Point(17, 96);
 
-            this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 
-            this.label11.Name = "label11";
 
-            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;
 
@@ -491,21 +468,10 @@
 
             this.cb_jzwfl_xstx.Size = new System.Drawing.Size(216, 20);
 
             this.cb_jzwfl_xstx.TabIndex = 42;
 
             // 
-            // cb_jzwfl_jsfs
 
-            // 
-            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);
 
-            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, 125);
 
+            this.label12.Location = new System.Drawing.Point(17, 98);
 
             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);
 
@@ -621,22 +587,20 @@
 
             this.groupBox5.Controls.Add(this.cb_yscf_klfw);
 
             this.groupBox5.Controls.Add(this.label21);
 
             this.groupBox5.Controls.Add(this.label22);
 
-            this.groupBox5.Controls.Add(this.label23);
 
             this.groupBox5.Controls.Add(this.cb_yscf_xstx);
 
-            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.Location = new System.Drawing.Point(8, 1032);
 
             this.groupBox5.Margin = new System.Windows.Forms.Padding(2);
 
             this.groupBox5.Name = "groupBox5";
 
             this.groupBox5.Padding = new System.Windows.Forms.Padding(2);
 
-            this.groupBox5.Size = new System.Drawing.Size(263, 263);
 
+            this.groupBox5.Size = new System.Drawing.Size(263, 205);
 
             this.groupBox5.TabIndex = 3;
 
             this.groupBox5.TabStop = false;
 
             this.groupBox5.Text = "元素成份图";
 
             // 
             // button5
 
             // 
-            this.button5.Location = new System.Drawing.Point(193, 224);
 
+            this.button5.Location = new System.Drawing.Point(193, 167);
 
             this.button5.Margin = new System.Windows.Forms.Padding(2);
 
             this.button5.Name = "button5";
 
             this.button5.Size = new System.Drawing.Size(37, 19);
 
@@ -647,7 +611,7 @@
 
             // 
             // tb_yscf_ysxx
 
             // 
-            this.tb_yscf_ysxx.Location = new System.Drawing.Point(16, 222);
 
+            this.tb_yscf_ysxx.Location = new System.Drawing.Point(16, 165);
 
             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;
 
@@ -679,7 +643,7 @@
 
             // 
             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, 134);
 
+            this.cb_yscf_klfw.Location = new System.Drawing.Point(14, 109);
 
             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);
 
@@ -688,7 +652,7 @@
 
             // label21
 
             // 
             this.label21.AutoSize = true;
 
-            this.label21.Location = new System.Drawing.Point(14, 120);
 
+            this.label21.Location = new System.Drawing.Point(12, 95);
 
             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);
 
@@ -705,17 +669,6 @@
 
             this.label22.TabIndex = 41;
 
             this.label22.Text = "显示图形";
 
             // 
-            // label23
 
-            // 
-            this.label23.AutoSize = true;
 
-            this.label23.Location = new System.Drawing.Point(14, 96);
 
-            this.label23.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 
-            this.label23.Name = "label23";
 
-            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;
 
@@ -726,21 +679,10 @@
 
             this.cb_yscf_xstx.Size = new System.Drawing.Size(214, 20);
 
             this.cb_yscf_xstx.TabIndex = 42;
 
             // 
-            // cb_yscf_jsfs
 
-            // 
-            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);
 
-            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
 
             // 
             this.label24.AutoSize = true;
 
-            this.label24.Location = new System.Drawing.Point(14, 208);
 
+            this.label24.Location = new System.Drawing.Point(14, 151);
 
             this.label24.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 
             this.label24.Name = "label24";
 
             this.label24.Size = new System.Drawing.Size(53, 12);
 
@@ -756,20 +698,18 @@
 
             this.groupBox6.Controls.Add(this.cb_ysfx_klfw);
 
             this.groupBox6.Controls.Add(this.label26);
 
             this.groupBox6.Controls.Add(this.label27);
 
-            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.Location = new System.Drawing.Point(3, 867);
 
             this.groupBox6.Margin = new System.Windows.Forms.Padding(2);
 
             this.groupBox6.Name = "groupBox6";
 
             this.groupBox6.Padding = new System.Windows.Forms.Padding(2);
 
-            this.groupBox6.Size = new System.Drawing.Size(268, 212);
 
+            this.groupBox6.Size = new System.Drawing.Size(268, 156);
 
             this.groupBox6.TabIndex = 4;
 
             this.groupBox6.TabStop = false;
 
             this.groupBox6.Text = "元素分析表";
 
             // 
             // button4
 
             // 
-            this.button4.Location = new System.Drawing.Point(198, 143);
 
+            this.button4.Location = new System.Drawing.Point(196, 114);
 
             this.button4.Margin = new System.Windows.Forms.Padding(2);
 
             this.button4.Name = "button4";
 
             this.button4.Size = new System.Drawing.Size(37, 19);
 
@@ -780,7 +720,7 @@
 
             // 
             // tb_ysfx_xsys
 
             // 
-            this.tb_ysfx_xsys.Location = new System.Drawing.Point(21, 143);
 
+            this.tb_ysfx_xsys.Location = new System.Drawing.Point(19, 114);
 
             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;
 
@@ -812,7 +752,7 @@
 
             // 
             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.Location = new System.Drawing.Point(19, 64);
 
             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);
 
@@ -821,7 +761,7 @@
 
             // label26
 
             // 
             this.label26.AutoSize = true;
 
-            this.label26.Location = new System.Drawing.Point(19, 75);
 
+            this.label26.Location = new System.Drawing.Point(17, 50);
 
             this.label26.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 
             this.label26.Name = "label26";
 
             this.label26.Size = new System.Drawing.Size(53, 12);
 
@@ -831,35 +771,13 @@
 
             // label27
 
             // 
             this.label27.AutoSize = true;
 
-            this.label27.Location = new System.Drawing.Point(19, 129);
 
+            this.label27.Location = new System.Drawing.Point(17, 100);
 
             this.label27.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 
             this.label27.Name = "label27";
 
             this.label27.Size = new System.Drawing.Size(53, 12);
 
             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;
 
-            this.label28.Location = new System.Drawing.Point(19, 51);
 
-            this.label28.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 
-            this.label28.Name = "label28";
 
-            this.label28.Size = new System.Drawing.Size(53, 12);
 
-            this.label28.TabIndex = 41;
 
-            this.label28.Text = "计算方式";
 
-            this.label28.Visible = false;
 
-            // 
             // groupBox7
 
             // 
             this.groupBox7.Controls.Add(this.cb_syxt_klfw);
 
@@ -872,23 +790,41 @@
 
             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.Location = new System.Drawing.Point(8, 1241);
 
             this.groupBox7.Margin = new System.Windows.Forms.Padding(2);
 
             this.groupBox7.Name = "groupBox7";
 
             this.groupBox7.Padding = new System.Windows.Forms.Padding(2);
 
-            this.groupBox7.Size = new System.Drawing.Size(263, 531);
 
+            this.groupBox7.Size = new System.Drawing.Size(263, 498);
 
             this.groupBox7.TabIndex = 7;
 
             this.groupBox7.TabStop = false;
 
             this.groupBox7.Text = "三元相图";
 
             // 
+            // cb_syxt_klfw
 
+            // 
+            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, 63);
 
+            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;
 
+            // 
+            // label41
 
+            // 
+            this.label41.AutoSize = true;
 
+            this.label41.Location = new System.Drawing.Point(14, 49);
 
+            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);
 
+            this.label41.TabIndex = 41;
 
+            this.label41.Text = "颗粒范围";
 
+            // 
             // lbv_syxt_mblb
 
             // 
             this.lbv_syxt_mblb.CheckBoxes = true;
 
             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.Location = new System.Drawing.Point(6, 232);
 
             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);
 
@@ -921,7 +857,7 @@
 
             // 
             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(14, 144);
 
+            this.cb_syxt_ljb.Location = new System.Drawing.Point(14, 112);
 
             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);
 
@@ -931,48 +867,17 @@
 
             // 
             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.Location = new System.Drawing.Point(14, 167);
 
             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;
 
             this.cb_syxt_mhxssl.SelectedIndexChanged += new System.EventHandler(this.cb_syxt_mhxssl_SelectedIndexChanged);
 
             // 
-            // cb_syxt_klfw
 
-            // 
-            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, 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;
 
-            // 
-            // cb_syxt_jsfs
 
-            // 
-            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);
 
-            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, 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);
 
-            this.label41.TabIndex = 41;
 
-            this.label41.Text = "颗粒范围";
 
-            // 
             // label38
 
             // 
             this.label38.AutoSize = true;
 
-            this.label38.Location = new System.Drawing.Point(12, 130);
 
+            this.label38.Location = new System.Drawing.Point(12, 98);
 
             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);
 
@@ -982,7 +887,7 @@
 
             // label33
 
             // 
             this.label33.AutoSize = true;
 
-            this.label33.Location = new System.Drawing.Point(14, 248);
 
+            this.label33.Location = new System.Drawing.Point(14, 211);
 
             this.label33.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 
             this.label33.Name = "label33";
 
             this.label33.Size = new System.Drawing.Size(101, 12);
 
@@ -992,24 +897,13 @@
 
             // label42
 
             // 
             this.label42.AutoSize = true;
 
-            this.label42.Location = new System.Drawing.Point(14, 198);
 
+            this.label42.Location = new System.Drawing.Point(12, 153);
 
             this.label42.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 
             this.label42.Name = "label42";
 
             this.label42.Size = new System.Drawing.Size(77, 12);
 
             this.label42.TabIndex = 41;
 
             this.label42.Text = "每行显示数量";
 
             // 
-            // label44
 
-            // 
-            this.label44.AutoSize = true;
 
-            this.label44.Location = new System.Drawing.Point(14, 48);
 
-            this.label44.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 
-            this.label44.Name = "label44";
 
-            this.label44.Size = new System.Drawing.Size(53, 12);
 
-            this.label44.TabIndex = 41;
 
-            this.label44.Text = "计算方式";
 
-            this.label44.Visible = false;
 
-            // 
             // groupBox8
 
             // 
             this.groupBox8.Controls.Add(this.button3);
 
@@ -1024,23 +918,21 @@
 
             this.groupBox8.Controls.Add(this.label30);
 
             this.groupBox8.Controls.Add(this.label34);
 
             this.groupBox8.Controls.Add(this.cb_kllb_klfw);
 
-            this.groupBox8.Controls.Add(this.cb_kllb_jsfs);
 
             this.groupBox8.Controls.Add(this.label35);
 
             this.groupBox8.Controls.Add(this.label29);
 
             this.groupBox8.Controls.Add(this.label36);
 
-            this.groupBox8.Controls.Add(this.label37);
 
-            this.groupBox8.Location = new System.Drawing.Point(8, 1921);
 
+            this.groupBox8.Location = new System.Drawing.Point(8, 1757);
 
             this.groupBox8.Margin = new System.Windows.Forms.Padding(2);
 
             this.groupBox8.Name = "groupBox8";
 
             this.groupBox8.Padding = new System.Windows.Forms.Padding(2);
 
-            this.groupBox8.Size = new System.Drawing.Size(263, 352);
 
+            this.groupBox8.Size = new System.Drawing.Size(263, 301);
 
             this.groupBox8.TabIndex = 6;
 
             this.groupBox8.TabStop = false;
 
             this.groupBox8.Text = "颗粒列表";
 
             // 
             // button3
 
             // 
-            this.button3.Location = new System.Drawing.Point(193, 213);
 
+            this.button3.Location = new System.Drawing.Point(195, 168);
 
             this.button3.Margin = new System.Windows.Forms.Padding(2);
 
             this.button3.Name = "button3";
 
             this.button3.Size = new System.Drawing.Size(37, 19);
 
@@ -1052,7 +944,7 @@
 
             // 
             // tb_kllb_ylsx
 
             // 
-            this.tb_kllb_ylsx.Location = new System.Drawing.Point(16, 159);
 
+            this.tb_kllb_ylsx.Location = new System.Drawing.Point(16, 114);
 
             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);
 
@@ -1060,7 +952,7 @@
 
             // 
             // tb_kllb_sxys
 
             // 
-            this.tb_kllb_sxys.Location = new System.Drawing.Point(16, 211);
 
+            this.tb_kllb_sxys.Location = new System.Drawing.Point(18, 166);
 
             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;
 
@@ -1071,7 +963,7 @@
 
             // ck_kllb_npxx
 
             // 
             this.ck_kllb_npxx.AutoSize = true;
 
-            this.ck_kllb_npxx.Location = new System.Drawing.Point(224, 299);
 
+            this.ck_kllb_npxx.Location = new System.Drawing.Point(224, 239);
 
             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);
 
@@ -1082,7 +974,7 @@
 
             // ck_kllb_fdtx
 
             // 
             this.ck_kllb_fdtx.AutoSize = true;
 
-            this.ck_kllb_fdtx.Location = new System.Drawing.Point(224, 273);
 
+            this.ck_kllb_fdtx.Location = new System.Drawing.Point(224, 213);
 
             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);
 
@@ -1093,7 +985,7 @@
 
             // ck_kllb_ystx
 
             // 
             this.ck_kllb_ystx.AutoSize = true;
 
-            this.ck_kllb_ystx.Location = new System.Drawing.Point(224, 247);
 
+            this.ck_kllb_ystx.Location = new System.Drawing.Point(224, 187);
 
             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);
 
@@ -1115,7 +1007,7 @@
 
             // label32
 
             // 
             this.label32.AutoSize = true;
 
-            this.label32.Location = new System.Drawing.Point(16, 301);
 
+            this.label32.Location = new System.Drawing.Point(16, 241);
 
             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);
 
@@ -1125,7 +1017,7 @@
 
             // label31
 
             // 
             this.label31.AutoSize = true;
 
-            this.label31.Location = new System.Drawing.Point(14, 275);
 
+            this.label31.Location = new System.Drawing.Point(14, 215);
 
             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);
 
@@ -1135,7 +1027,7 @@
 
             // label30
 
             // 
             this.label30.AutoSize = true;
 
-            this.label30.Location = new System.Drawing.Point(14, 249);
 
+            this.label30.Location = new System.Drawing.Point(14, 189);
 
             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);
 
@@ -1156,26 +1048,16 @@
 
             // 
             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.Location = new System.Drawing.Point(14, 63);
 
             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;
 
             // 
-            // cb_kllb_jsfs
 
-            // 
-            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);
 
-            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;
 
-            // 
             // label35
 
             // 
             this.label35.AutoSize = true;
 
-            this.label35.Location = new System.Drawing.Point(14, 95);
 
+            this.label35.Location = new System.Drawing.Point(12, 49);
 
             this.label35.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 
             this.label35.Name = "label35";
 
             this.label35.Size = new System.Drawing.Size(53, 12);
 
@@ -1185,7 +1067,7 @@
 
             // label29
 
             // 
             this.label29.AutoSize = true;
 
-            this.label29.Location = new System.Drawing.Point(14, 145);
 
+            this.label29.Location = new System.Drawing.Point(14, 100);
 
             this.label29.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 
             this.label29.Name = "label29";
 
             this.label29.Size = new System.Drawing.Size(53, 12);
 
@@ -1195,7 +1077,7 @@
 
             // label36
 
             // 
             this.label36.AutoSize = true;
 
-            this.label36.Location = new System.Drawing.Point(14, 197);
 
+            this.label36.Location = new System.Drawing.Point(16, 152);
 
             this.label36.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 
             this.label36.Name = "label36";
 
             this.label36.Size = new System.Drawing.Size(53, 12);
 
@@ -1203,16 +1085,6 @@
 
             this.label36.Text = "显示元素";
 
             this.label36.Visible = false;
 
             // 
-            // label37
 
-            // 
-            this.label37.AutoSize = true;
 
-            this.label37.Location = new System.Drawing.Point(14, 48);
 
-            this.label37.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 
-            this.label37.Name = "label37";
 
-            this.label37.Size = new System.Drawing.Size(53, 12);
 
-            this.label37.TabIndex = 41;
 
-            this.label37.Text = "计算方式";
 
-            // 
             // button6
 
             // 
             this.button6.Location = new System.Drawing.Point(855, 47);
 
@@ -1496,9 +1368,7 @@
 
         private System.Windows.Forms.Label label13;
 
         private System.Windows.Forms.ComboBox cb_jzwfl_ljb;
 
         private System.Windows.Forms.Label label19;
 
-        private System.Windows.Forms.Label label11;
 
         private System.Windows.Forms.ComboBox cb_jzwfl_xstx;
 
-        private System.Windows.Forms.ComboBox cb_jzwfl_jsfs;
 
         private System.Windows.Forms.Label label12;
 
         private System.Windows.Forms.GroupBox groupBox4;
 
         private System.Windows.Forms.CheckBox ck_klcc_xsmk;
 
@@ -1516,28 +1386,22 @@
 
         private System.Windows.Forms.ComboBox cb_yscf_klfw;
 
         private System.Windows.Forms.Label label21;
 
         private System.Windows.Forms.Label label22;
 
-        private System.Windows.Forms.Label label23;
 
         private System.Windows.Forms.ComboBox cb_yscf_xstx;
 
-        private System.Windows.Forms.ComboBox cb_yscf_jsfs;
 
         private System.Windows.Forms.Label label24;
 
         private System.Windows.Forms.GroupBox groupBox6;
 
         private System.Windows.Forms.TextBox tb_ysfx_xsys;
 
         private System.Windows.Forms.CheckBox ck_ysfx_xsmk;
 
         private System.Windows.Forms.Label label25;
 
         private System.Windows.Forms.ComboBox cb_ysfx_klfw;
 
-        private System.Windows.Forms.ComboBox cb_yxfx_jsfs;
 
         private System.Windows.Forms.Label label26;
 
         private System.Windows.Forms.Label label27;
 
-        private System.Windows.Forms.Label label28;
 
         private System.Windows.Forms.GroupBox groupBox7;
 
         private System.Windows.Forms.CheckBox ck_syxt_xsmk;
 
         private System.Windows.Forms.Label label40;
 
         private System.Windows.Forms.ComboBox cb_syxt_mhxssl;
 
         private System.Windows.Forms.ComboBox cb_syxt_klfw;
 
-        private System.Windows.Forms.ComboBox cb_syxt_jsfs;
 
         private System.Windows.Forms.Label label41;
 
         private System.Windows.Forms.Label label42;
 
-        private System.Windows.Forms.Label label44;
 
         private System.Windows.Forms.GroupBox groupBox8;
 
         private System.Windows.Forms.TextBox tb_kllb_ylsx;
 
         private System.Windows.Forms.TextBox tb_kllb_sxys;
 
@@ -1550,11 +1414,9 @@
 
         private System.Windows.Forms.Label label30;
 
         private System.Windows.Forms.Label label34;
 
         private System.Windows.Forms.ComboBox cb_kllb_klfw;
 
-        private System.Windows.Forms.ComboBox cb_kllb_jsfs;
 
         private System.Windows.Forms.Label label35;
 
         private System.Windows.Forms.Label label29;
 
         private System.Windows.Forms.Label label36;
 
-        private System.Windows.Forms.Label label37;
 
         private System.Windows.Forms.CheckBox ck_ym;
 
         private System.Windows.Forms.Button button5;
 
         private System.Windows.Forms.Button button4;

+ 20 - 20
OTSIncAReportApp/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.cs
Целия файл 

@@ -64,7 +64,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             cb_jzwfl_xstx.SelectedIndex = 0;
 
             //计算方式
 
             //BindComboBox(DisplayPicutureType.AnalyzeDataChart, cb_jzwfl_jsfs, OTS_RETORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, (int)CALCULATE_CHART_TYPE.TRIO_CHART, OTS_RETORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
 
-            BindComboBox(cb_jzwfl_jsfs, OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
 
+            //BindComboBox(cb_jzwfl_jsfs, OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
 
             //粒级表
 
             //BindComboBox(DisplayPicutureType.AnalyzeDataChart, cb_jzwfl_ljb, OTS_RETORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, (int)CALCULATE_CHART_TYPE.TRIO_CHART, OTS_RETORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE);
 
             BindComboBox(cb_jzwfl_ljb, OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE);
 
@@ -76,7 +76,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             #region 元素分析表
 
             //计算方式
 
             //BindComboBox(DisplayPicutureType.AnalyzeDataChart, cb_yxfx_jsfs, OTS_RETORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, (int)CALCULATE_CHART_TYPE.TRIO_CHART, OTS_RETORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
 
-            BindComboBox(cb_yxfx_jsfs, OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
 
+            //BindComboBox(cb_yxfx_jsfs, OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
 
             //颗粒范围
 
             //BindComboBox(DisplayPicutureType.AnalyzeDataTable, cb_ysfx_klfw, OTS_RETORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE, (int)CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO, OTS_RETORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
 
             BindComboBox(cb_ysfx_klfw, OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
 
@@ -92,7 +92,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             cb_yscf_xstx.SelectedIndex = 0;
 
             //计算方式
 
             //BindComboBox(DisplayPicutureType.AnalyzeDataChart, cb_yscf_jsfs, OTS_RETORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, (int)CALCULATE_CHART_TYPE.TRIO_CHART, OTS_RETORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
 
-            BindComboBox(cb_yscf_jsfs, OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
 
+            //BindComboBox(cb_yscf_jsfs, OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
 
             //颗粒范围
 
             //BindComboBox(DisplayPicutureType.AnalyzeDataTable, cb_yscf_klfw, OTS_RETORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE, (int)CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO, OTS_RETORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
 
             BindComboBox(cb_yscf_klfw, OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
 
@@ -101,7 +101,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             #region 三元相图
 
             //计算方式
 
             //BindComboBox(DisplayPicutureType.AnalyzeDataChart, cb_syxt_jsfs, OTS_RETORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, (int)CALCULATE_CHART_TYPE.TRIO_CHART, OTS_RETORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
 
-            BindComboBox(cb_syxt_jsfs, OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
 
+            //BindComboBox(cb_syxt_jsfs, OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
 
             //颗粒范围
 
             //BindComboBox(DisplayPicutureType.AnalyzeDataTable, cb_syxt_klfw, OTS_RETORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, (int)CALCULATE_CHART_TYPE.TRIO_CHART, OTS_RETORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
 
             BindComboBox(cb_syxt_klfw, OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
 
@@ -127,7 +127,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             #region 颗粒列表
 
             //计算方式
 
             //BindComboBox(DisplayPicutureType.AnalyzeDataChart, cb_kllb_jsfs, OTS_RETORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, (int)CALCULATE_CHART_TYPE.TRIO_CHART, OTS_RETORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
 
-            BindComboBox(cb_kllb_jsfs, OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
 
+            //BindComboBox(cb_kllb_jsfs, OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
 
             //颗粒范围
 
             //BindComboBox(DisplayPicutureType.AnalyzeDataTable, cb_kllb_klfw, OTS_RETORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE, (int)CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO, OTS_RETORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
 
             BindComboBox(cb_kllb_klfw, OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
 
@@ -573,8 +573,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_cb_jzwfl_xsmk = cb_jzwfl_xsmk.Checked;
 
             m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_jzwfl_xstx = cb_jzwfl_xstx.Text;//选择图像
 
             m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_jzwfl_xstx = cb_jzwfl_xstx.SelectedIndex;
 
-            m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_jzwfl_jsfs = cb_jzwfl_jsfs.Text;//计算方式
 
-            m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_jzwfl_jsfs = cb_jzwfl_jsfs.SelectedIndex;
 
+            //m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_jzwfl_jsfs = cb_jzwfl_jsfs.Text;//计算方式
 
+            //m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_jzwfl_jsfs = cb_jzwfl_jsfs.SelectedIndex;
 
             m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_jzwfl_ljb = cb_jzwfl_ljb.Text;//粒级表
 
             m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_jzwfl_ljb = cb_jzwfl_ljb.SelectedIndex;
 
             m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_jzwfl_klfw = cb_jzwfl_klfw.Text;//颗粒范围
 
@@ -582,8 +582,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
 
             //元素分析结果
 
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.b_ck_ysfx_xsmk = ck_ysfx_xsmk.Checked;
 
-            m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yxfx_jsfs = cb_yxfx_jsfs.Text;//计算方式
 
-            m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yxfx_jsfs = cb_yxfx_jsfs.SelectedIndex;
 
+            //m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yxfx_jsfs = cb_yxfx_jsfs.Text;//计算方式
 
+            //m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yxfx_jsfs = cb_yxfx_jsfs.SelectedIndex;
 
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_ysfx_klfw = cb_ysfx_klfw.Text;//颗粒范围
 
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_ysfx_klfw = cb_ysfx_klfw.SelectedIndex;
 
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_tb_ysfx_xsys = tb_ysfx_xsys.Text;//显示元素
 
@@ -591,16 +591,16 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.b_ck_yscf_xsmk = ck_yscf_xsmk.Checked;
 
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yscf_xstx = cb_yscf_xstx.Text;//显示图形
 
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yscf_xstx = cb_yscf_xstx.SelectedIndex;
 
-            m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yscf_jsfs = cb_yscf_jsfs.Text;//计算方式
 
-            m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yscf_jsfs = cb_yscf_jsfs.SelectedIndex;
 
+            //m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yscf_jsfs = cb_yscf_jsfs.Text;//计算方式
 
+            //m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yscf_jsfs = cb_yscf_jsfs.SelectedIndex;
 
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yscf_klfw = cb_yscf_klfw.Text;//颗粒范围
 
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yscf_klfw = cb_yscf_klfw.SelectedIndex;
 
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_tb_yscf_ysxx = tb_yscf_ysxx.Text;//显示元素
 
 
             //三元相图
 
             m_OTSReport_Export.m_mbszclass.M_SYXT.b_ck_syxt_xsmk = ck_syxt_xsmk.Checked;
 
-            m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_jsfs = cb_syxt_jsfs.Text;//计算方式
 
-            m_OTSReport_Export.m_mbszclass.M_SYXT.index_cb_syxt_jsfs = cb_syxt_jsfs.SelectedIndex;
 
+            //m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_jsfs = cb_syxt_jsfs.Text;//计算方式
 
+            //m_OTSReport_Export.m_mbszclass.M_SYXT.index_cb_syxt_jsfs = cb_syxt_jsfs.SelectedIndex;
 
             m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_klfw = cb_syxt_klfw.Text;//颗粒范围
 
             m_OTSReport_Export.m_mbszclass.M_SYXT.index_cb_syxt_klfw = cb_syxt_klfw.SelectedIndex;
 
             m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_ljb = cb_syxt_ljb.Text;//粒级表
 
@@ -626,8 +626,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
 
             //颗粒列表信息
 
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_xsmk = ck_kllb_xsmk.Checked;
 
-            m_OTSReport_Export.m_mbszclass.M_KLLBXX.str_cb_kllb_jsfs = cb_kllb_jsfs.Text;//计算方式
 
-            m_OTSReport_Export.m_mbszclass.M_KLLBXX.index_cb_kllb_jsfs = cb_kllb_jsfs.SelectedIndex;
 
+            //m_OTSReport_Export.m_mbszclass.M_KLLBXX.str_cb_kllb_jsfs = cb_kllb_jsfs.Text;//计算方式
 
+            //m_OTSReport_Export.m_mbszclass.M_KLLBXX.index_cb_kllb_jsfs = cb_kllb_jsfs.SelectedIndex;
 
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.str_cb_kllb_klfw = cb_kllb_klfw.Text;//颗粒范围
 
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.index_cb_kllb_klfw = cb_kllb_klfw.SelectedIndex;
 
             if (ck_kllb_xsmk.Checked)
 
@@ -675,7 +675,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             //cb_jzwfl_xstx.Text = m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_jzwfl_xstx;//选择图像
 
             cb_jzwfl_xstx.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_jzwfl_xstx;
 
             //cb_jzwfl_jsfs.Text = m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_jzwfl_jsfs;//计算方式
 
-            cb_jzwfl_jsfs.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_jzwfl_jsfs;
 
+            //cb_jzwfl_jsfs.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_jzwfl_jsfs;
 
             //cb_jzwfl_ljb.Text = m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_jzwfl_ljb;//粒级表
 
             cb_jzwfl_ljb.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_jzwfl_ljb;
 
             //cb_jzwfl_klfw.Text = m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_jzwfl_klfw;//颗粒范围
 
@@ -684,7 +684,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             //元素分析结果
 
             ck_ysfx_xsmk.Checked = m_OTSReport_Export.m_mbszclass.M_YSFXJG.b_ck_ysfx_xsmk;
 
             //cb_yxfx_jsfs.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yxfx_jsfs;//计算方式
 
-            cb_yxfx_jsfs.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yxfx_jsfs;
 
+            //cb_yxfx_jsfs.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yxfx_jsfs;
 
             //cb_ysfx_klfw.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_ysfx_klfw;//颗粒范围
 
             cb_ysfx_klfw.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_ysfx_klfw;
 
             tb_ysfx_xsys.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_tb_ysfx_xsys;//显示元素
 
@@ -693,7 +693,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             //cb_yscf_xstx.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yscf_xstx;//显示图形
 
             cb_yscf_xstx.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yscf_xstx;
 
             //cb_yscf_jsfs.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yscf_jsfs;//计算方式
 
-            cb_yscf_jsfs.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yscf_jsfs;
 
+            //cb_yscf_jsfs.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yscf_jsfs;
 
             //cb_yscf_klfw.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yscf_klfw;//颗粒范围
 
             cb_yscf_klfw.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yscf_klfw;
 
             tb_yscf_ysxx.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_tb_yscf_ysxx;//显示元素
 
@@ -701,7 +701,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             //三元相图
 
             ck_syxt_xsmk.Checked = m_OTSReport_Export.m_mbszclass.M_SYXT.b_ck_syxt_xsmk;
 
             //cb_syxt_jsfs.Text = m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_jsfs;//计算方式
 
-            cb_syxt_jsfs.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_SYXT.index_cb_syxt_jsfs;
 
+            //cb_syxt_jsfs.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_SYXT.index_cb_syxt_jsfs;
 
             //cb_syxt_klfw.Text = m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_klfw;//颗粒范围
 
             cb_syxt_klfw.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_SYXT.index_cb_syxt_klfw;
 
 
@@ -725,7 +725,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             //颗粒列表信息
 
             ck_kllb_xsmk.Checked = m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_xsmk;
 
             //cb_kllb_jsfs.Text = m_OTSReport_Export.m_mbszclass.M_KLLBXX.str_cb_kllb_jsfs;//计算方式
 
-            cb_kllb_jsfs.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLLBXX.index_cb_kllb_jsfs;
 
+            //cb_kllb_jsfs.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLLBXX.index_cb_kllb_jsfs;
 
             //cb_kllb_klfw.Text = m_OTSReport_Export.m_mbszclass.M_KLLBXX.str_cb_kllb_klfw;//颗粒范围
 
             cb_kllb_klfw.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLLBXX.index_cb_kllb_klfw;