提交代码

2024-04-01 10:29:19 +08:00
parent 0ae4143492
commit 8df0e06e6b
23 changed files with 27332 additions and 53 deletions
@@ -5,6 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
    <title></title>
+    <script src="~/res/js/jquery-3.4.1.min.js"></script>
    <style type="text/css">
        .f-grid-row.noEdit {
            pointer-events: none;
@@ -14,6 +15,29 @@
            white-space: normal;
            word-break: break-all;
        }
+
+        .imgPreview {
+            display: none;
+            top: 0;
+            left: 0;
+            width: 100%; /*容器占满整个屏幕*/
+            height: 100%;
+            position: fixed;
+            background: rgba(0, 0, 0, 0.5);
+        }
+
+            .imgPreview img {
+                z-index: 100;
+                width: 60%;
+                position: fixed;
+                top: 50%;
+                left: 50%;
+                transform: translate(-50%,-50%);
+            }
+        /*添加鼠标移入图片效果*/
+        .img {
+            cursor: url("ico/放大镜.png"), auto;
+        }
    </style>
 </head>
 <body>
@@ -39,21 +63,40 @@
                        </f:Toolbar>
                    </Toolbars>
                    <Columns>
-                        <f:BoundField Width="60px" ColumnID="Code" DataField="Code" HeaderTextAlign="Center" 
+                        <f:BoundField Width="60px" ColumnID="Code" DataField="Code" HeaderTextAlign="Center" EnableLock="true" Locked="true"
                            HeaderText="序号" />
-                        <f:BoundField Width="200px" ColumnID="ProjectName" DataField="ProjectName" HeaderText="项目名称/项目号或本部" TextAlign="Center" />
-                        <f:BoundField Width="100px" ColumnID="ProcessName" DataField="ProcessName" HeaderText="工序名称" TextAlign="Center" />
+                        <f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
                        <f:RenderField Width="100px" ColumnID="RaiseDate" DataField="RaiseDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="提出时间"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="填报日期"
                            HeaderTextAlign="Center" TextAlign="Center">
                        </f:RenderField>
-                        <f:RenderField Width="300px" ColumnID="ProblemDescription" DataField="ProblemDescription"
-                            FieldType="String" HeaderText="问题描述" HeaderTextAlign="Center" TextAlign="Center">
+                        <f:RenderField Width="100px" ColumnID="Major" DataField="Major"
+                            FieldType="String" HeaderText="填报专业" HeaderTextAlign="Center" TextAlign="Center">
                        </f:RenderField>
-                        <f:RenderField Width="300px" ColumnID="HandleMethod" DataField="HandleMethod" ExpandUnusedSpace="true"
-                            FieldType="String" HeaderText="处理方法" HeaderTextAlign="Center" TextAlign="Center">
+                        <f:RenderField Width="120px" ColumnID="ProcessName" DataField="ProcessName"
+                            FieldType="String" HeaderText="装置" HeaderTextAlign="Center" TextAlign="Center">
                        </f:RenderField>
-                        <f:RenderField Width="300px" ColumnID="ExperienceOrSuggestion" DataField="ExperienceOrSuggestion"
+                        <f:RenderField Width="400px" ColumnID="ProblemDescription" DataField="ProblemDescription"
+                            FieldType="String" HeaderText="案例描述" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="400px" ColumnID="HandleMethod" DataField="HandleMethod"
+                            FieldType="String" HeaderText="案例分析及解决方案" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="tfImageUrl1" Width="180px" HeaderText="问题图片" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                            <ItemTemplate>
+                                <asp:Label ID="lbImageUrl1" runat="server" Text='<%# ConvertImageUrlByImage(Eval("Id")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField ColumnID="tfImageUrl2" Width="180px" HeaderText="处理后图片" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                            <ItemTemplate>
+                                <asp:Label ID="lbImageUrl2" runat="server" Text='<%# ConvertImageUrlByImage2(Eval("Id")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="400px" ColumnID="ExperienceOrSuggestion" DataField="ExperienceOrSuggestion"
                            FieldType="String" HeaderText="体会或建议" HeaderTextAlign="Center" TextAlign="Center">
                        </f:RenderField>
                    </Columns>
@@ -61,5 +104,34 @@
            </Items>
        </f:Panel>
    </form>
+    <div class="imgPreview">
+        <img src="#" alt="" id="imgPreview" />
+    </div>
+    <script type="text/jscript">
+        var imgID = '<%=Grid1.ClientID %>';
+        F.ready(function () {
+            var $wrap = $("#" + imgID)
+            $wrap.find('img').on('click', function () {
+                var src = $(this).attr('src');
+                console.log(src);
+                $('.imgPreview img').attr('src', src);
+
+                $('.imgPreview').show()
+            });
+            $('.imgPreview').on('click', function () {
+                $('.imgPreview').hide()
+            });
+            /* $wrap.find('img').hover(function (e) {
+                 console.log($(this).offset())
+                 var top = $(this).offset().top;
+                 var left = $(this).offset().left - 200;
+                 var src = $(this).attr('src')
+                 console.log('src', src, top, left)
+                 $('#imgID1').css("left", left).css("top", top).show().find('img').attr('src', src)
+             }, function () {
+                 $('#imgID1').hide()
+             })*/
+        })
+    </script>
 </body>
 </html>
@@ -60,7 +60,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
                                           join y in db.Sys_User on x.UserId equals y.UserId
                                           where x.UserId == this.drpUser.SelectedValue && x.RaiseDate >= startDate && x.RaiseDate < endDate
                                           orderby x.ProjectId
-                                           select new { x.TestRunMonthSummaryId, x.ProjectId, x.UserId, y.UserName, x.ProcessName, x.RaiseDate, x.ProblemDescription, x.HandleMethod, x.ExperienceOrSuggestion }).ToList();
+                                           select new { x.TestRunMonthSummaryId, x.ProjectId, x.UserId, y.UserName, x.Major, x.ProcessName, x.RaiseDate, x.ProblemDescription, x.HandleMethod, x.ExperienceOrSuggestion }).ToList();
            if (getTestRunMonthSummarys.Count() > 0)
            {
                DataTable table = new DataTable();
@@ -76,6 +76,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
                table.Columns.Add(new DataColumn("Id", typeof(String)));
                table.Columns.Add(new DataColumn("Code", typeof(String)));
                table.Columns.Add(new DataColumn("ProjectName", typeof(String)));
+                table.Columns.Add(new DataColumn("Major", typeof(String)));
                table.Columns.Add(new DataColumn("ProcessName", typeof(String)));
                table.Columns.Add(new DataColumn("RaiseDate", typeof(String)));
                table.Columns.Add(new DataColumn("ProblemDescription", typeof(String)));
@@ -86,7 +87,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
                for (int i = 0; i < months.Count; i++)
                {
                    row = table.NewRow();
-                    row["Id"] = i;
+                    row["Id"] = SQLHelper.GetNewID();
                    row["Code"] = GetNum(i + 1);
                    row["ProjectName"] = months[i].Year + "年" + months[i].Month + "月份开车技术总结";
                    DateTime monthEndDate = months[i].AddMonths(1);
@@ -97,7 +98,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
                    foreach (var item in monthList)
                    {
                        row = table.NewRow();
-                        row["Id"] = SQLHelper.GetNewID();
+                        row["Id"] = item.TestRunMonthSummaryId;
                        var project = projects.FirstOrDefault(x => x.ProjectId == item.ProjectId);
                        if (project != null)
                        {
@@ -115,6 +116,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
                                projectName = row["ProjectName"].ToString();
                            }
                        }
+                        row["Major"] = item.Major;
                        row["ProcessName"] = item.ProcessName;
                        row["RaiseDate"] = item.RaiseDate;
                        row["ProblemDescription"] = item.ProblemDescription;
@@ -242,5 +244,45 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
                this.Grid1.DataBind();
            }
        }
+
+        /// <summary>
+        /// 获取整改前图片(放于Img中)
+        /// </summary>
+        /// <param name="TestRunMonthSummaryId"></param>
+        /// <returns></returns>
+        protected string ConvertImageUrlByImage(object TestRunMonthSummaryId)
+        {
+            string url = string.Empty;
+            string httpUrl = string.Empty;
+            if (TestRunMonthSummaryId != null)
+            {
+                var file = BLL.AttachFileService.GetAttachFileByToKeyId(TestRunMonthSummaryId.ToString());
+                if (file != null)
+                {
+                    url = BLL.UploadAttachmentService.ShowImage(Funs.SGGLUrl, file.AttachUrl);
+                }
+            }
+            return url;
+        }
+
+        /// <summary>
+        /// 获取整改前图片(放于Img中)
+        /// </summary>
+        /// <param name="TestRunMonthSummaryId"></param>
+        /// <returns></returns>
+        protected string ConvertImageUrlByImage2(object TestRunMonthSummaryId)
+        {
+            string url = string.Empty;
+            string httpUrl = string.Empty;
+            if (TestRunMonthSummaryId != null)
+            {
+                var file = BLL.AttachFileService.GetAttachFileByToKeyId(TestRunMonthSummaryId.ToString() + "R");
+                if (file != null)
+                {
+                    url = BLL.UploadAttachmentService.ShowImage(Funs.SGGLUrl, file.AttachUrl);
+                }
+            }
+            return url;
+        }
    }
 }
@@ -92,5 +92,23 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnSave;
+        
+        /// <summary>
+        /// lbImageUrl1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbImageUrl1;
+        
+        /// <summary>
+        /// lbImageUrl2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbImageUrl2;
    }
 }