diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index 05c5675..67687d2 100644
Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ
diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx
index 0d254cf..e20fad9 100644
--- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx
+++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx
@@ -27,21 +27,21 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList runat="server"  Label="焊接方法" ID="drpWeldingMethod" EnableMultiSelect="true" ShowRedStar="true" Required="true" LabelWidth="120px" EnableEdit="false">
+                        <f:DropDownList runat="server"  Label="可焊焊接方法" ID="drpWeldingMethod" EnableMultiSelect="true" ShowRedStar="true" Required="true" LabelWidth="120px" EnableEdit="false">
                         </f:DropDownList>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtCertificateNo" runat="server" Label="证书编号" MaxLength="50" LabelWidth="120px">
-                        </f:TextBox>
+                        <f:DropDownList ID="drpMaterialType" runat="server" EnableMultiSelect="true" Label="焊接材质类型范围" MaxLength="50" LabelWidth="120px">
+                        </f:DropDownList>
 
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="考试日期" ID="txtCheckDate" LabelWidth="120px" EnableEdit="false">
-                        </f:DatePicker>
+                        <f:DropDownList runat="server"  Label="焊接位置范围" ID="drpWeldingLocation" LabelWidth="120px" EnableMultiSelect="true" EnableEdit="false">
+                        </f:DropDownList>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs
index f25df8c..7d8e772 100644
--- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs
@@ -54,15 +54,7 @@ namespace FineUIPro.Web.WelderManage
                     {
                         this.WED_ID = welderQualifiedProject.WelderId;
                         this.txtQualifiedProjectCode.Text = welderQualifiedProject.QualifiedProjectCode;
-                        //if (welderQualifiedProject.LimitDate.HasValue)
-                        //{
-                        //    this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", welderQualifiedProject.LimitDate);
-                        //}
-                        this.txtCertificateNo.Text = welderQualifiedProject.CertificateNo;
-                        if (welderQualifiedProject.CheckDate.HasValue)
-                        {
-                            this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", welderQualifiedProject.CheckDate);
-                        }
+                       
                         this.txtExamProject.Text = welderQualifiedProject.ExamProject;
                         txtRemark.Text = welderQualifiedProject.Remark;
                         drpIsPass.SelectedValue = welderQualifiedProject.IsPass == true ? "是" : "否";
diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs
index bb32de8..1915e90 100644
--- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs
+++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs
@@ -78,22 +78,22 @@ namespace FineUIPro.Web.WelderManage
         protected global::FineUIPro.DropDownList drpWeldingMethod;
 
         /// <summary>
-        /// txtCertificateNo 控件。
+        /// drpMaterialType 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtCertificateNo;
+        protected global::FineUIPro.DropDownList drpMaterialType;
 
         /// <summary>
-        /// txtCheckDate 控件。
+        /// drpWeldingLocation 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtCheckDate;
+        protected global::FineUIPro.DropDownList drpWeldingLocation;
 
         /// <summary>
         /// txtExamProject 控件。