20221008 焊接数据分析修改

SGGL/BLL/API/HJGL/APIPackagingManageService.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    internal class APIPackagingManageService
+    {
+    }
+}

SGGL/BLL/BLL.csproj

@@ -147,6 +147,7 @@
     <Compile Include="API\APIUserService.cs" />
     <Compile Include="API\HJGL\APIHotProcessHardService.cs" />
     <Compile Include="API\HJGL\APINDETrustService.cs" />
+    <Compile Include="API\HJGL\APIPackagingManageService.cs" />
     <Compile Include="API\HJGL\APIPipeJointService.cs" />
     <Compile Include="API\HJGL\APIPreWeldingDailyService.cs" />
     <Compile Include="API\HJGL\APIReportQueryService.cs" />

SGGL/FineUIPro.Web/ErrLog.txt

@@ -379,3 +379,90 @@ IP地址:::1
 
 出错时间:10/08/2022 15:12:38
 
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:d:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\mainMenu_HJGL.aspx(142): error CS0103: 当前上下文中不存在名称“E05_Values01_1”
+错误堆栈:
+   在 System.Web.Compilation.BuildManager.PostProcessFoundBuildResult(BuildResult result, Boolean keyFromVPP, VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetBuildResultFromCacheInternal(String cacheKey, Boolean keyFromVPP, VirtualPath virtualPath, Int64 hashCode, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultFromCacheInternal(VirtualPath virtualPath, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:10/08/2022 22:20:32
+出错文件:http://localhost:8008/common/mainMenu_HJGL.aspx
+IP地址:::1
+
+出错时间:10/08/2022 22:20:32
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 FineUIPro.Web.mainMenu_HJGL.Page_Load(Object sender, EventArgs e)
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:10/08/2022 23:33:05
+出错文件:http://localhost:8008/common/mainMenu_HJGL.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:10/08/2022 23:33:05
+
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:c:\Users\1420031550\AppData\Local\Temp\Temporary ASP.NET Files\vs\294a0955\1ae38a57\App_Web_mainmenu_hjgl.aspx.38131f0b.m2-fqnhl.0.cs(556): error CS1061: “ASP.common_mainmenu_hjgl_aspx”不包含“echarts02Value”的定义，并且找不到可接受类型为“ASP.common_mainmenu_hjgl_aspx”的第一个参数的扩展方法“echarts02Value”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+   在 System.Web.Compilation.AssemblyBuilder.Compile()
+   在 System.Web.Compilation.BuildProvidersCompiler.PerformBuild()
+   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:10/08/2022 23:33:11
+出错文件:http://localhost:8008/common/mainMenu_HJGL.aspx
+IP地址:::1
+
+出错时间:10/08/2022 23:33:11
+
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:c:\Users\1420031550\AppData\Local\Temp\Temporary ASP.NET Files\vs\294a0955\1ae38a57\App_Web_mainmenu_hjgl.aspx.38131f0b.m2-fqnhl.0.cs(556): error CS1061: “ASP.common_mainmenu_hjgl_aspx”不包含“echarts02Value”的定义，并且找不到可接受类型为“ASP.common_mainmenu_hjgl_aspx”的第一个参数的扩展方法“echarts02Value”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+   在 System.Web.Compilation.BuildManager.PostProcessFoundBuildResult(BuildResult result, Boolean keyFromVPP, VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetBuildResultFromCacheInternal(String cacheKey, Boolean keyFromVPP, VirtualPath virtualPath, Int64 hashCode, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultFromCacheInternal(VirtualPath virtualPath, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:10/08/2022 23:33:18
+出错文件:http://localhost:8008/common/mainMenu_HJGL.aspx
+IP地址:::1
+
+出错时间:10/08/2022 23:33:18
+

SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx

@@ -6,6 +6,37 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>首页</title>
     <link href="../res/indexv1/assets/css/sub_index.css" rel="stylesheet" />
+        <style type="text/css">
+ 
+            .real-time-num {
+                text-align: center;
+                min-width: 0.75rem;
+                margin-right: 0.02083rem;
+                font-size: revert;
+                color: #6ceff1;
+            }
+            .real-time-echarts02 {
+                text-align: center;
+                min-width: 0.75rem;
+                margin-right: 0.02083rem;
+                font-size: revert;
+                color: rgb(6 247 192 / 85%);
+            }
+            .real-time-echarts02-unit {
+                text-align: right;
+                min-width: 0.75rem;
+                margin-right: 0.02083rem;
+                font-size: x-large;
+                color: rgb(6 247 192 / 85%);
+            }
+            .real-time-num-unit {
+                text-align: right;
+                min-width: 0.75rem;
+                margin-right: 0.02083rem;
+                font-size: small;
+                color: #6ceff1;
+            }
+    </style>
 </head>
 <body>
     <div class="sd-sub-body sd-sub-body--welding dis-flex">
@@ -44,29 +75,17 @@
             </div>--%>
             <div class="sub-section sub-section-02">
                 <div class="sub-section-header">
-                    <span class="sub-section-title">管道实时预制率</span>
+                    <span class="sub-section-title">管道预制率分析</span>
                 </div>
                 <div class="sub-section-inner">
-                    <div id="echarts02" class="echarts-box" style="width: 80%; height: 80%;"></div>
+                    <%--<div id="echarts02" class="echarts-box" style="width: 80%; height: 80%;"></div>--%>
+                    <div class="real-time-echarts02" runat="server" id="echarts02Value">
+                    </div>
+                    <div class="real-time-echarts02-unit" runat="server" id="div2">%
                     </div>
                 </div>
-            <%--<div class="sub-section sub-section-02">
-                <div class="sub-section-header">
-                    <span class="sub-section-title">项目焊接工程量统计</span>
-                    <div class="sub-right-select">
-                        <div class="sub-select-name">
-                            <span class="sub-select-value">按达因量</span><span class="dropdown-arrow"></span>
             </div>
-                        <ul class="sub-select-ul">
+ 
-                            <li class="sub-select-li active" data-type="1">按达因量</li>
-                            <li class="sub-select-li" data-type="2">按焊口数</li>
-                        </ul>
-                    </div>
-                </div>
-                <div class="sub-section-inner">
-                    <div id="echarts02" class="echarts-box" style="width: 80%; height: 80%;"></div>
-                </div>
-            </div>--%>
             <div class="sub-section sub-section-03">
                 <div class="sub-section-header">
                     <span class="sub-section-title">焊工功效分析</span>
@@ -85,6 +104,8 @@
                     <%--<div id="echarts03" class="echarts-box"></div>--%>
                     <div class="real-time-num" runat="server" id="divWelderEfficacyNum">
                     </div>
+                    <div class="real-time-num-unit" runat="server" id="div1">DIN/天
+                    </div>
                 </div>
             </div>
         </div>
@@ -97,6 +118,9 @@
                         <li class="sub-section-item active" data-type="fbs">分包商</li>
                         <li class="sub-section-item" data-type="dwgc">单位工程</li>
                         <li class="sub-section-item" data-type="czlb">材质类别</li>
+                        <li class="sub-section-item" data-type="gg">焊缝规格</li>
+                        <li class="sub-section-item" data-type="lx">焊缝类型</li>
+                        <li class="sub-section-item" data-type="sx">焊缝属性</li>
                     </ul>
                 </div>
                 <div class="sub-section-inner">
@@ -105,11 +129,12 @@
             </div>
             <div class="sub-section sub-section-05">
                 <div class="sub-section-header">
-                    <span class="sub-section-title">焊接进度分析</span>
+                    <span class="sub-section-title">焊接缺陷分析</span>
                     <ul class="sub-sections-tabs">
-                        <li class="sub-section-item active" data-type="fbs">分包商</li>
+                        <li class="sub-section-item active" data-type="cz">材质类别</li>
-                        <li class="sub-section-item" data-type="dwgc">单位工程</li>
+                        <li class="sub-section-item" data-type="gg">焊缝规格</li>
-                        <li class="sub-section-item" data-type="czlb">材质类别</li>
+                        <li class="sub-section-item" data-type="lx">焊缝类型</li>
+                        <li class="sub-section-item" data-type="sx">焊缝属性</li>
                     </ul>
                 </div>
                 <div class="sub-section-inner">
@@ -121,8 +146,8 @@
                     <span class="sub-section-title">焊工业绩分析</span>
                     <ul class="sub-sections-tabs">
                         <li class="sub-section-item active" data-type="fbs">分包商</li>
-                        <li class="sub-section-item" data-type="dwgc">单位工程</li>
+                       <%-- <li class="sub-section-item" data-type="dwgc">单位工程</li>
-                        <li class="sub-section-item" data-type="czlb">材质类别</li>
+                        <li class="sub-section-item" data-type="czlb">材质类别</li>--%>
                     </ul>
                 </div>
                 <div class="sub-section-inner">
@@ -136,28 +161,51 @@
     <script src="../res/indexv1/assets/js/echarts-5.2.0.min.js" type="text/javascript"></script>
     <script src="../res/indexv1/assets/js/draw-circle.js" type="text/javascript"></script>
     <script type="text/javascript">
-        // 施工分包商
+        //////////////焊接一次合格率
+        //分包商
+        var dataE04_Type01 = JSON.parse('<%=E04_Type01 %>');
+        var dataE04_Values01 = JSON.parse('<%=E04_Values01 %>');
+        // 单位工程
+        var dataE04_Type02 = JSON.parse('<%=E04_Type02 %>');
+        var dataE04_Values02 = JSON.parse('<%=E04_Values02 %>');
+        // 材料类别
+        var dataE04_Type03 = JSON.parse('<%=E04_Type03 %>');
+        var dataE04_Values03 = JSON.parse('<%=E04_Values03 %>');
+        //焊缝规格
+        var dataE04_Type04 = JSON.parse('<%=E04_Type04 %>');
+        var dataE04_Values04 = JSON.parse('<%=E04_Values04 %>');
+        //焊缝类型
+        var dataE04_Type05 = JSON.parse('<%=E04_Type05 %>');
+        var dataE04_Values05 = JSON.parse('<%=E04_Values05 %>');
+        //焊缝属性
+        var dataE04_Type06 = JSON.parse('<%=E04_Type06 %>');
+        var dataE04_Values06 = JSON.parse('<%=E04_Values06 %>');
+        /////////////////////////焊接缺陷分析
+        // 材质类别
         var dataE05_Type01 = JSON.parse('<%=E05_Type01 %>');
-        var dataE05_Values01_1 = JSON.parse('<%=E05_Values01_1 %>');
+        var dataE05_Values01 = JSON.parse('<%=E05_Values01 %>');
-        var dataE05_Values01_2 = JSON.parse('<%=E05_Values01_2 %>');
+        // 焊缝规格
-        // 单位工程
         var dataE05_Type02 = JSON.parse('<%=E05_Type02 %>');
-        var dataE05_Values02_1 = JSON.parse('<%=E05_Values02_1 %>');
+        var dataE05_Values02 = JSON.parse('<%=E05_Values02 %>');
-        var dataE05_Values02_2 = JSON.parse('<%=E05_Values02_2 %>');
+        // 焊缝类型
-        // 材料类别
         var dataE05_Type03 = JSON.parse('<%=E05_Type03 %>');
-        var dataE05_Values03_1 = JSON.parse('<%=E05_Values03_1 %>');
+        var dataE05_Values03 = JSON.parse('<%=E05_Values03 %>');
-        var dataE05_Values03_2 = JSON.parse('<%=E05_Values03_2 %>');
+        //焊缝属性
+        var dataE05_Type04 = JSON.parse('<%=E05_Type04 %>');
+        var dataE05_Values04 = JSON.parse('<%=E05_Values04 %>');
 
-
+        ////////////////////焊工业绩分析
-        var dataE08_Type01 = JSON.parse('<%=E08_Type01 %>');
+        var dataE06_Type01 = JSON.parse('<%=E06_Type01 %>');
-        var dataE08_Values01 = JSON.parse('<%=E08_Values01 %>');
+        var dataE06_Values01 = JSON.parse('<%=E06_Values01 %>');
         // 单位工程
-        var dataE08_Type02 = JSON.parse('<%=E08_Type02 %>');
+        var dataE06_Type02 = JSON.parse('<%=E06_Type02 %>');
-        var dataE08_Values02 = JSON.parse('<%=E08_Values02 %>');
+        var dataE06_Values02 = JSON.parse('<%=E06_Values02 %>');
         // 材料类别
-        var dataE08_Type03 = JSON.parse('<%=E08_Type03 %>');
+        var dataE06_Type03 = JSON.parse('<%=E06_Type03 %>');
-        var dataE08_Values03 = JSON.parse('<%=E08_Values03 %>');
+        var dataE06_Values03 = JSON.parse('<%=E06_Values03 %>');
+
+
+      
         $(function () {
             ///一次合格率
             // 施工分包商
@@ -171,7 +219,7 @@
                 } else if (type == '2') {
                      initEchart02({ canvasId: 'echarts02', y: <%=HK1 %>, n: <%=HK2 %> })
                  }--%>
-                initEchart02({ canvasId: 'echarts02', y: <%=PipeRate1 %>, n: <%=PipeRate2 %> })
+                <%-- initEchart02({ canvasId: 'echarts02', y: <%=PipeRate1 %>, n: <%=PipeRate2 %> })--%>
             })
             $('.sub-section-03 ul li').click(function () {
                 var value = $(this).text()
@@ -200,41 +248,54 @@
                 $(this).addClass('active').siblings().removeClass('active')
                 if (type == 'fbs') {
                     // 分包商
-                    initEchart04(dataE08_Type01, dataE08_Values01)
+                    initEchart04(dataE04_Type01, dataE04_Values01)
                 } else if (type == 'dwgc') {
                     // 单位工程
-                    initEchart04(dataE08_Type02, dataE08_Values02)
+                    initEchart04(dataE04_Type02, dataE04_Values02)
                 } else if (type == 'czlb') {
                     // 材质类别
-                    initEchart04(dataE08_Type03, dataE08_Values03)
+                    initEchart04(dataE04_Type03, dataE04_Values03)
+                } else if (type == 'gg') {
+                    // 焊缝规格
+                    initEchart04(dataE04_Type04, dataE04_Values04)
+                } else if (type == 'lx') {
+                    // 焊缝类型
+                    initEchart04(dataE04_Type05, dataE04_Values05)
+                } else if (type == 'sx') {
+                    // 焊缝属性
+                    initEchart04(dataE04_Type06, dataE04_Values06)
                 }
             })
             $('.sub-section-05 ul li').click(function () {
                 var type = $(this).attr('data-type')
                 $(this).addClass('active').siblings().removeClass('active')
-                if (type == 'fbs') {
+                if (type == 'cz') {
                     // 分包商
-                    initEchart05(dataE05_Type01, dataE05_Values01_1, dataE05_Values01_2)
+                    initEchart05(dataE05_Type01, dataE05_Values01)
-                } else if (type == 'dwgc') {
+                } else if (type == 'gg') {
                     // 单位工程
-                    initEchart05(dataE05_Type02, dataE05_Values02_1, dataE05_Values02_2)
+                    initEchart05(dataE05_Type02, dataE05_Values02)
-                } else if (type == 'czlb') {
+                } else if (type == 'lb') {
                     // 材质类别
-                    initEchart05(dataE05_Type03, dataE05_Values03_1, dataE05_Values03_2)
+                    initEchart05(dataE05_Type03, dataE05_Values03)
+                }
+                else if (type == 'sx') {
+                    // 材质类别
+                    initEchart05(dataE05_Type04, dataE05_Values04)
                 }
             })
             $('.sub-section-06 ul li').click(function () {
                 var type = $(this).attr('data-type')
                 $(this).addClass('active').siblings().removeClass('active')
                 if (type == 'fbs') {
-                    var data = [40, 90, 83, 95, 80, 40, 90, 83, 95, 80, 40]
+                    // 分包商
-                    initEchart06(data)
+                    initEchart06(dataE06_Type01, dataE06_Values01)
                 } else if (type == 'dwgc') {
-                    var data = [80, 90, 83, 95, 80, 20, 90, 83, 95, 80, 20]
+                    // 单位工程
-                    initEchart06(data)
+                    initEchart06(dataE06_Type02, dataE06_Values02)
                 } else if (type == 'czlb') {
-                    var data = [120, 90, 83, 95, 10, 40, 90, 83, 95, 80, 30]
+                    // 材质类别
-                    initEchart06(data)
+                    initEchart06(dataE06_Type03, dataE06_Values03)
                 }
             }) 
 
@@ -500,7 +561,7 @@
                 });
             }
 
-            function initEchart05(xAxisData, data1, data2) {
+            function initEchart05(xAxisData, data) {
                 var chartDom = document.getElementById('echarts05');
                 var myChart = echarts.init(chartDom, null);
                 var option;
@@ -576,10 +637,10 @@
                     },
                     series: [
                         {
-                            name: '焊口数',
+                            name: '缺陷数',
                             type: 'bar',
                             barWidth: 20,
-                            data: data1,
+                            data: data,
                             barGap: '10%',/*多个并排柱子设置柱子之间的间距*/
                             itemStyle: {
                                 color: '#1ab1ff',
@@ -598,29 +659,7 @@
                                 }
                             }
                         },
-                        {
+                         
-                            name: '完成焊口数',
-                            type: 'bar',
-                            barWidth: 20,
-                            data: data2,
-                            barGap: '10%',/*多个并排柱子设置柱子之间的间距*/
-                            itemStyle: {
-                                color: '#4cffc3',
-                                emphasis: {
-                                    barBorderRadius: [10, 10, 0, 0],
-                                },
-                                normal: {
-                                    barBorderRadius: [10, 10, 0, 0],
-                                    color: new echarts.graphic.LinearGradient(
-                                        1, 1, 1, 0,
-                                        [
-                                            { offset: 0, color: '#4affc6' },
-                                            { offset: 1, color: '#18fdf9' }
-                                        ]
-                                    )
-                                }
-                            }
-                        },
                     ]
                 };
 
@@ -632,11 +671,11 @@
                 });
             }
 
-            function initEchart06(data) {
+            function initEchart06(xAxisData,data) {
                 var chartDom = document.getElementById('echarts06');
                 var myChart = echarts.init(chartDom);
                 var option;
-                var xAxisData = ['类型1', '类型2', '类型3', '类型4', '类型5', '类型6', '类型7', '类型8', '类型9', '类型10', '类型11']
+              //  var xAxisData = ['类型1', '类型2', '类型3', '类型4', '类型5', '类型6', '类型7', '类型8', '类型9', '类型10', '类型11']
                 option = {
                     color: ['#499ab6'],
                     grid: {
@@ -734,7 +773,7 @@
             }
            // initEchart02({ canvasId: 'echarts01', y: <%=GCRate1 %>, n: <%=GCRate2 %>  })
            // initEchart02({ canvasId: 'echarts02', y: <%=XCRate1 %>, n: <%=XCRate2 %>  })
-           initEchart02({ canvasId: 'echarts02', y: <%=PipeRate1 %>, n: <%=PipeRate2 %>  })
+       <%--    initEchart02({ canvasId: 'echarts02', y: <%=PipeRate1 %>, n: <%=PipeRate2 %>  })--%>
             // 03的数值
             var indicator = [
                 { text: '问题1', max: 150, },
@@ -745,11 +784,11 @@
                 { text: '问题2', max: 150, }
             ]
            // initEchart03({ name: '按分包商', value: [130, 93, 50, 90, 70, 60], indicator: indicator })
-            initEchart04(dataE08_Type01, dataE08_Values01)
+            initEchart04(dataE04_Type01, dataE04_Values01)
-            var data = [100, 50, 100, 100, 100, 100, 100, 50, 100, 100, 100];
+            initEchart05(dataE05_Type01, dataE05_Values01)
-            initEchart05(dataE05_Type01, dataE05_Values01_1, dataE05_Values01_2)
+            initEchart06(dataE06_Type01, dataE06_Values01)
-            var data = [40, 90, 83, 95, 80, 40, 90, 83, 95, 80, 40]
+
-            initEchart06(data)
+           
         })
     </script>
 </body>

SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs

@@ -205,7 +205,7 @@ namespace FineUIPro.Web
             ////焊接检测单明细
             getCH_CheckItemList = (from x in Funs.DB.HJGL_Batch_NDEItem
                                    join y in Funs.DB.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
-                                   join z in Funs.DB.HJGL_WeldJoint on y.WeldJointId equals z.WeldJointId
+                                   join z in Funs.DB.View_HJGL_WeldJoint on y.WeldJointId equals z.WeldJointId
                                    join line in Funs.DB.HJGL_Pipeline on z.PipelineId equals line.PipelineId
                                    where z.ProjectId == this.ProjectId
                                    select new Model.sp_index_HJGLItem
@@ -213,10 +213,16 @@ namespace FineUIPro.Web
                                        ProjectId = line.ProjectId,
                                        ID = x.NDEItemID,
                                        UnitId = line.UnitId,  ///重定义单位
+                                       UnitName=z.UnitName,
                                        WorkAreaId = line.UnitId, /// 重定义区域
                                        MaterialId = line.UnitWorkId,  ///重定义材质
                                        CHT_TotalFilm = x.TotalFilm,
-                                       CHT_PassFilm = x.PassFilm
+                                       CHT_PassFilm = x.PassFilm,
+                                       Specification = z.Specification,
+                                       WeldTypeCode=z.WeldTypeCode,
+                                       JointAttribute=z.JointAttribute,
+                                       UnitWorkName=z.UnitWorkName,
+                                       MaterialCode=z.MaterialCode
                                    }).ToList();
             ////总焊工
             getAllWelderList = from x in Funs.DB.SitePerson_Person
@@ -230,6 +236,8 @@ namespace FineUIPro.Web
             getecharts05();
             getecharts06();
             this.divWelderEfficacyNum.InnerText = BLL.HJGL_WeldingReportService.GetWelderEfficacy(this.CurrUser .LoginProjectId).ToString() ;
+            this.echarts02Value.InnerText = Math.Floor(Math.Round(decimal.Parse((PipeRate1 / (PipeRate1+ PipeRate2)).ToString("0.000")), 2) * 100).ToString();
+
 
         }
 
@@ -364,43 +372,150 @@ namespace FineUIPro.Web
         #endregion
 
         #region 焊接一次合格率
-        protected string E08_Type01;
+        protected string E04_Type01;
-        protected string E08_Values01;
+        protected string E04_Values01;
-
+        protected string E04_Type02;
-        protected string E08_Type02;
+        protected string E04_Values02;
-        protected string E08_Values02;
+        protected string E04_Type03;
-
+        protected string E04_Values03;
-        protected string E08_Type03;
+        protected string E04_Type04;
-        protected string E08_Values03;
+        protected string E04_Values04;
+        protected string E04_Type05;
+        protected string E04_Values05;
+        protected string E04_Type06;
+        protected string E04_Values06;
         /// <summary>
         ///  焊接一次合格率
         /// </summary>
+        //protected void getecharts04()
+        //{
+        //    E08_Type01 = "[]";
+        //    E08_Values01 = "[]";
+
+        //    E08_Type02 = "[]";
+        //    E08_Values02 = "[]";
+
+        //    E08_Type03 = "[]";
+        //    E08_Values03 = "[]";
+        //    double PassRate = 0;
+        //    int current_pass_film = 0;
+        //    int cht_totalfilm = 0;
+        //    //// 按单位
+        //    List<string> type01List = new List<string>();
+        //    List<double> count011List = new List<double>();
+        //    foreach (var itemUnit in getProjectUnitList)
+        //    {
+        //        string unitName = UnitService.GetUnitNameByUnitId(itemUnit.UnitId);
+        //        type01List.Add(unitName);
+        //        var getUJots = from x in getCH_CheckItemList
+        //                       where x.UnitId == itemUnit.UnitId
+        //                       select x;
+        //        PassRate = 0;
+        //        current_pass_film = getUJots.Sum(x => x.CHT_PassFilm) ?? 0;
+        //        cht_totalfilm = getUJots.Sum(x => x.CHT_TotalFilm) ?? 0;
+        //        if (cht_totalfilm > 0)
+        //        {
+        //            PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
+        //        }
+        //        count011List.Add(PassRate);
+        //    }
+        //    if (type01List.Count() > 0)
+        //    {
+        //        E08_Type01 = JsonConvert.SerializeObject(type01List);
+        //        E08_Values01 = JsonConvert.SerializeObject(count011List);
+        //    }
+        //    ///按单位工程           
+        //    List<string> type02List = new List<string>();
+        //    List<double> count021List = new List<double>();
+        //    var getWorkAreas = from x in Funs.DB.WBS_UnitWork
+        //                       where x.ProjectId == this.ProjectId
+        //                       select x;
+        //    foreach (var itemWorkArea in getWorkAreas)
+        //    {
+        //        type02List.Add(itemWorkArea.UnitWorkName);
+        //        var getWJots = from x in getCH_CheckItemList
+        //                       where x.WorkAreaId == itemWorkArea.UnitWorkId
+        //                       select x;
+
+        //        PassRate = 0;
+        //        current_pass_film = getWJots.Sum(x => x.CHT_PassFilm) ?? 0;
+        //        cht_totalfilm = getWJots.Sum(x => x.CHT_TotalFilm) ?? 0;
+        //        if (cht_totalfilm > 0)
+        //        {
+        //            PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
+        //        }
+        //        count021List.Add(PassRate);
+        //    }
+        //    if (type02List.Count() > 0)
+        //    {
+        //        E08_Type02 = JsonConvert.SerializeObject(type02List);
+        //        E08_Values02 = JsonConvert.SerializeObject(count021List);
+        //    }
+
+        //    ///按材质类别
+        //    List<string> type03List = new List<string>();
+        //    List<double> count031List = new List<double>();
+        //    var getMaterials = from x in Funs.DB.Base_Material
+        //                       join y in Funs.DB.HJGL_Pipeline on x.MaterialId equals y.MaterialId
+        //                       where y.ProjectId == this.ProjectId
+        //                       select x;
+        //    foreach (var itemMaterial in getMaterials)
+        //    {
+        //        string code = itemMaterial.MaterialCode;
+        //        type03List.Add(code);
+        //        var getMJots = from x in getCH_CheckItemList
+        //                       where x.MaterialId == itemMaterial.MaterialId
+        //                       select x;
+
+        //        PassRate = 0;
+        //        current_pass_film = getMJots.Sum(x => x.CHT_PassFilm) ?? 0;
+        //        cht_totalfilm = getMJots.Sum(x => x.CHT_TotalFilm) ?? 0;
+        //        if (cht_totalfilm > 0)
+        //        {
+        //            PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
+        //        }
+        //        count031List.Add(PassRate);
+        //    }
+        //    if (type03List.Count() > 0)
+        //    {
+        //        E08_Type03 = JsonConvert.SerializeObject(type03List);
+        //        E08_Values03 = JsonConvert.SerializeObject(count031List);
+        //    }
+        //}
         protected void getecharts04()
         {
-            E08_Type01 = "[]";
+            E04_Type01 = "[]";
-            E08_Values01 = "[]";
+            E04_Values01 = "[]";
+            E04_Type02 = "[]";
+            E04_Values02 = "[]";
+            E04_Type03 = "[]";
+            E04_Values03 = "[]";
+            E04_Type04 = "[]";
+            E04_Values04 = "[]";
 
-            E08_Type02 = "[]";
+            E04_Type05 = "[]";
-            E08_Values02 = "[]";
+            E04_Values05 = "[]";
+
+            E04_Type06 = "[]";
+            E04_Values06 = "[]";
 
-            E08_Type03 = "[]";
-            E08_Values03 = "[]";
             double PassRate = 0;
             int current_pass_film = 0;
             int cht_totalfilm = 0;
             //// 按单位
             List<string> type01List = new List<string>();
             List<double> count011List = new List<double>();
-            foreach (var itemUnit in getProjectUnitList)
+            var tb_type01 = getCH_CheckItemList.GroupBy(x => x.UnitName).Select(x => new {
+                UnitName=x.Key,
+                Current_pass_film=x.Sum(m => m.CHT_PassFilm) ??0,
+                Cht_totalfilm = x.Sum(m => m.CHT_TotalFilm) ?? 0
+            });
+            foreach (var item in tb_type01)
             {
-                string unitName = UnitService.GetUnitNameByUnitId(itemUnit.UnitId);
+                type01List.Add(item.UnitName);
-                type01List.Add(unitName);
-                var getUJots = from x in getCH_CheckItemList
-                               where x.UnitId == itemUnit.UnitId
-                               select x;
                 PassRate = 0;
-                current_pass_film = getUJots.Sum(x => x.CHT_PassFilm) ?? 0;
+                current_pass_film = item.Current_pass_film;
-                cht_totalfilm = getUJots.Sum(x => x.CHT_TotalFilm) ?? 0;
+                cht_totalfilm = item.Cht_totalfilm;
                 if (cht_totalfilm > 0)
                 {
                     PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
@@ -409,25 +524,24 @@ namespace FineUIPro.Web
             }
             if (type01List.Count() > 0)
             {
-                E08_Type01 = JsonConvert.SerializeObject(type01List);
+                E04_Type01 = JsonConvert.SerializeObject(type01List);
-                E08_Values01 = JsonConvert.SerializeObject(count011List);
+                E04_Values01 = JsonConvert.SerializeObject(count011List);
             }
+
             ///按单位工程           
             List<string> type02List = new List<string>();
             List<double> count021List = new List<double>();
-            var getWorkAreas = from x in Funs.DB.WBS_UnitWork
+            var tb_type02 = getCH_CheckItemList.GroupBy(x => x.UnitWorkName).Select(x => new {
-                               where x.ProjectId == this.ProjectId
+                UnitWorkName = x.Key,
-                               select x;
+                Current_pass_film = x.Sum(m => m.CHT_PassFilm) ?? 0,
-            foreach (var itemWorkArea in getWorkAreas)
+                Cht_totalfilm = x.Sum(m => m.CHT_TotalFilm) ?? 0
+            });
+            foreach (var item in tb_type02)
             {
-                type02List.Add(itemWorkArea.UnitWorkName);
+                type02List.Add(item.UnitWorkName);
-                var getWJots = from x in getCH_CheckItemList
-                               where x.WorkAreaId == itemWorkArea.UnitWorkId
-                               select x;
-
                 PassRate = 0;
-                current_pass_film = getWJots.Sum(x => x.CHT_PassFilm) ?? 0;
+                current_pass_film = item.Current_pass_film;
-                cht_totalfilm = getWJots.Sum(x => x.CHT_TotalFilm) ?? 0;
+                cht_totalfilm = item.Cht_totalfilm;
                 if (cht_totalfilm > 0)
                 {
                     PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
@@ -436,28 +550,25 @@ namespace FineUIPro.Web
             }
             if (type02List.Count() > 0)
             {
-                E08_Type02 = JsonConvert.SerializeObject(type02List);
+                E04_Type02 = JsonConvert.SerializeObject(type02List);
-                E08_Values02 = JsonConvert.SerializeObject(count021List);
+                E04_Values02 = JsonConvert.SerializeObject(count021List);
             }
 
+
             ///按材质类别
             List<string> type03List = new List<string>();
             List<double> count031List = new List<double>();
-            var getMaterials = from x in Funs.DB.Base_Material
+            var tb_type03 = getCH_CheckItemList.GroupBy(x => x.MaterialCode).Select(x => new {
-                               join y in Funs.DB.HJGL_Pipeline on x.MaterialId equals y.MaterialId
+                MaterialCode = x.Key,
-                               where y.ProjectId == this.ProjectId
+                Current_pass_film = x.Sum(m => m.CHT_PassFilm) ?? 0,
-                               select x;
+                Cht_totalfilm = x.Sum(m => m.CHT_TotalFilm) ?? 0
-            foreach (var itemMaterial in getMaterials)
+            });
+            foreach (var item in tb_type03)
             {
-                string code = itemMaterial.MaterialCode;
+                type03List.Add(item.MaterialCode);
-                type03List.Add(code);
-                var getMJots = from x in getCH_CheckItemList
-                               where x.MaterialId == itemMaterial.MaterialId
-                               select x;
-
                 PassRate = 0;
-                current_pass_film = getMJots.Sum(x => x.CHT_PassFilm) ?? 0;
+                current_pass_film = item.Current_pass_film;
-                cht_totalfilm = getMJots.Sum(x => x.CHT_TotalFilm) ?? 0;
+                cht_totalfilm = item.Cht_totalfilm;
                 if (cht_totalfilm > 0)
                 {
                     PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
@@ -466,122 +577,296 @@ namespace FineUIPro.Web
             }
             if (type03List.Count() > 0)
             {
-                E08_Type03 = JsonConvert.SerializeObject(type03List);
+                E04_Type03 = JsonConvert.SerializeObject(type03List);
-                E08_Values03 = JsonConvert.SerializeObject(count031List);
+                E04_Values03 = JsonConvert.SerializeObject(count031List);
+            }
+            //焊缝规格
+            List<string> type04List = new List<string>();
+            List<double> count041List = new List<double>();
+            var tb_type04 = getCH_CheckItemList.GroupBy(x => x.Specification).Select(x => new {
+                Specification = x.Key,
+                Current_pass_film = x.Sum(m => m.CHT_PassFilm) ?? 0,
+                Cht_totalfilm = x.Sum(m => m.CHT_TotalFilm) ?? 0
+            });
+            foreach (var item in tb_type04)
+            {
+                type04List.Add(item.Specification);
+                PassRate = 0;
+                current_pass_film = item.Current_pass_film;
+                cht_totalfilm = item.Cht_totalfilm;
+                if (cht_totalfilm > 0)
+                {
+                    PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
+                }
+                count041List.Add(PassRate);
+            }
+            if (type04List.Count() > 0)
+            {
+                E04_Type04 = JsonConvert.SerializeObject(type04List);
+                E04_Values04 = JsonConvert.SerializeObject(count041List);
+            }
+            //焊缝类型
+            List<string> type05List = new List<string>();
+            List<double> count051List = new List<double>();
+            var tb_type05 = getCH_CheckItemList.GroupBy(x => x.WeldTypeCode).Select(x => new {
+                WeldTypeCode = x.Key,
+                Current_pass_film = x.Sum(m => m.CHT_PassFilm) ?? 0,
+                Cht_totalfilm = x.Sum(m => m.CHT_TotalFilm) ?? 0
+            });
+            foreach (var item in tb_type05)
+            {
+                type05List.Add(item.WeldTypeCode);
+                PassRate = 0;
+                current_pass_film = item.Current_pass_film;
+                cht_totalfilm = item.Cht_totalfilm;
+                if (cht_totalfilm > 0)
+                {
+                    PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
+                }
+                count051List.Add(PassRate);
+            }
+            if (type05List.Count() > 0)
+            {
+                E04_Type05 = JsonConvert.SerializeObject(type05List);
+                E04_Values05 = JsonConvert.SerializeObject(count051List);
+            }
+            //焊缝属性
+            List<string> type06List = new List<string>();
+            List<double> count061List = new List<double>();
+            var tb_type06 = getCH_CheckItemList.GroupBy(x => x.JointAttribute).Select(x => new {
+                JointAttribute = x.Key,
+                Current_pass_film = x.Sum(m => m.CHT_PassFilm) ?? 0,
+                Cht_totalfilm = x.Sum(m => m.CHT_TotalFilm) ?? 0
+            });
+            foreach (var item in tb_type06)
+            {
+                type06List.Add(item.JointAttribute);
+                PassRate = 0;
+                current_pass_film = item.Current_pass_film;
+                cht_totalfilm = item.Cht_totalfilm;
+                if (cht_totalfilm > 0)
+                {
+                    PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
+                }
+                count061List.Add(PassRate);
+            }
+            if (type06List.Count() > 0)
+            {
+                E04_Type06 = JsonConvert.SerializeObject(type06List);
+                E04_Values06 = JsonConvert.SerializeObject(count061List);
             }
         }
 
         #endregion
 
-        #region 焊接进度分析
+        #region 焊接缺陷分析
         protected string E05_Type01;
-        protected string E05_Values01_1;
+        protected string E05_Values01;
-        protected string E05_Values01_2;
-
         protected string E05_Type02;
-        protected string E05_Values02_1;
+        protected string E05_Values02;
-        protected string E05_Values02_2;
-
         protected string E05_Type03;
-        protected string E05_Values03_1;
+        protected string E05_Values03;
-        protected string E05_Values03_2;
+        protected string E05_Type04;
+        protected string E05_Values04;
+
+
         /// <summary>
         ///  焊接进度分析
         /// </summary>
+        //protected void getecharts05()
+        //{
+        //    E05_Type01 = "[]";
+        //    E05_Values01_1 = "[]";
+        //    E05_Values01_2 = "[]";
+        //    E05_Type02 = "[]";
+        //    E05_Values02_1 = "[]";
+        //    E05_Values02_2 = "[]";
+
+        //    E05_Type03 = "[]";
+        //    E05_Values03_1 = "[]";
+        //    E05_Values03_2 = "[]";
+
+        //    //// 按单位
+        //    List<string> type01List = new List<string>();
+        //    List<int> count011List = new List<int>();
+        //    List<int> count012List = new List<int>();
+        //    foreach (var itemUnit in getProjectUnitList)
+        //    {
+        //        string unitName = UnitService.GetUnitNameByUnitId(itemUnit.UnitId);
+        //        type01List.Add(unitName);
+        //        var getUJots = from x in getAllJotList
+        //                       join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+        //                       where y.UnitId == itemUnit.UnitId
+        //                       select x;
+        //        count011List.Add(getUJots.Count());
+        //        var getUCJots = from x in getFinishedJotList
+        //                        join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+        //                        where y.UnitId == itemUnit.UnitId
+        //                        select x;
+        //        count012List.Add(getUCJots.Count());
+        //    }
+        //    if (type01List.Count() > 0)
+        //    {
+        //        E05_Type01 = JsonConvert.SerializeObject(type01List);
+        //        E05_Values01_1 = JsonConvert.SerializeObject(count011List);
+        //        E05_Values01_2 = JsonConvert.SerializeObject(count012List);
+        //    }
+        //    ///按单位工程           
+        //    List<string> type02List = new List<string>();
+        //    List<int> count021List = new List<int>();
+        //    List<int> count022List = new List<int>();
+        //    var getWorkAreas = from x in Funs.DB.WBS_UnitWork
+        //                       where x.ProjectId == this.ProjectId
+        //                       select x;
+        //    foreach (var itemWorkArea in getWorkAreas)
+        //    {
+        //        type02List.Add(itemWorkArea.UnitWorkName);
+        //        var getWJots = from x in getAllJotList
+        //                       join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+        //                       where y.UnitWorkId == itemWorkArea.UnitWorkId
+        //                       select x;
+        //        count021List.Add(getWJots.Count());
+        //        var getWCJots = from x in getFinishedJotList
+        //                        join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+        //                        where y.UnitWorkId == itemWorkArea.UnitWorkId
+        //                        select x;
+        //        count022List.Add(getWCJots.Count());
+        //    }
+        //    if (type02List.Count() > 0)
+        //    {
+        //        E05_Type02 = JsonConvert.SerializeObject(type02List);
+        //        E05_Values02_1 = JsonConvert.SerializeObject(count021List);
+        //        E05_Values02_2 = JsonConvert.SerializeObject(count022List);
+        //    }
+
+        //    ///按材质类别
+        //    List<string> type03List = new List<string>();
+        //    List<int> count031List = new List<int>();
+        //    List<int> count032List = new List<int>();
+        //    var getMaterials = (from x in Funs.DB.Base_Material
+        //                       join y in Funs.DB.HJGL_Pipeline on x.MaterialId equals y.MaterialId  
+        //                       where y.ProjectId == this.ProjectId
+        //                       select x).ToList().Distinct();
+        //    foreach (var itemMaterial in getMaterials)
+        //    {
+        //        string code = itemMaterial.MaterialCode;
+        //        type03List.Add(code);
+        //        var getWJots = from x in getAllJotList
+        //                       join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+        //                       where y.MaterialId == itemMaterial.MaterialId
+        //                       select x;
+        //        count031List.Add(getWJots.Count());
+        //        var getWCJots = from x in getFinishedJotList
+        //                        join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+        //                        where y.MaterialId == itemMaterial.MaterialId
+        //                        select x;
+        //        count032List.Add(getWCJots.Count());
+        //    }
+        //    if (type03List.Count() > 0)
+        //    {
+        //        E05_Type03 = JsonConvert.SerializeObject(type03List);
+        //        E05_Values03_1 = JsonConvert.SerializeObject(count031List);
+        //        E05_Values03_2 = JsonConvert.SerializeObject(count032List);
+        //    }
+        //}
+
+
         protected void getecharts05()
         {
           E05_Type01="[]";
-            E05_Values01_1 = "[]";
+          E05_Values01="[]";
-            E05_Values01_2 = "[]";
           E05_Type02 = "[]";
-            E05_Values02_1 = "[]";
+          E05_Values02 = "[]";
-            E05_Values02_2 = "[]";
-
           E05_Type03 = "[]";
-            E05_Values03_1 = "[]";
+          E05_Values03 = "[]";
-            E05_Values03_2 = "[]";
+          E05_Type04 = "[]";
+          E05_Values04 = "[]";
 
-            //// 按单位
+        var alllist = from x in Funs.DB.HJGL_Batch_NDEItem
-            List<string> type01List = new List<string>();
+                          join y in Funs.DB.HJGL_Batch_NDE on x.NDEID equals y.NDEID
-            List<int> count011List = new List<int>();
+                          join z in Funs.DB.View_Batch_NDEItem on x.NDEID equals z.NDEID
-            List<int> count012List = new List<int>();
+                          join m in Funs.DB.View_HJGL_Pipeline on z.PipelineCode equals m.PipelineCode
-            foreach (var itemUnit in getProjectUnitList)
+                          join n in Funs.DB.View_HJGL_WeldJoint on z.WeldJointId equals n.WeldJointId
+                          where x.CheckDefects != null && x.CheckDefects != "" && y.ProjectId == this.CurrUser.LoginProjectId
+                          select new
                           {
-                string unitName = UnitService.GetUnitNameByUnitId(itemUnit.UnitId);
+                              x.CheckDefects,
-                type01List.Add(unitName);
+                              m.MaterialCode,
-                var getUJots = from x in getAllJotList
+                              n.Specification,
-                               join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+                              n.WeldTypeCode,
-                               where y.UnitId == itemUnit.UnitId
+                              n.JointAttribute,
-                               select x;
+                          };
-                count011List.Add(getUJots.Count());
+            ///按材质类别
-                var getUCJots = from x in getFinishedJotList
+            List<string> type01List = new List<string>();
-                                join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+            List<decimal> count011List = new List<decimal>();
-                                where y.UnitId == itemUnit.UnitId
+            var tb_type01 = alllist.GroupBy(x => x.MaterialCode).Select(x => new
-                                select x;
+            {
-                count012List.Add(getUCJots.Count());
+                MaterialCode = x.Key,
+                Defect = x.Count()
+            });
+            foreach (var item in tb_type01)
+            {
+                type01List.Add(item.MaterialCode);
+                count011List.Add(item.Defect);
             }
             if (type01List.Count() > 0)
             {
                 E05_Type01 = JsonConvert.SerializeObject(type01List);
-                E05_Values01_1 = JsonConvert.SerializeObject(count011List);
+                E05_Values01 = JsonConvert.SerializeObject(count011List);
-                E05_Values01_2 = JsonConvert.SerializeObject(count012List);
             }
-            ///按单位工程           
+            //焊缝规格
             List<string> type02List = new List<string>();
-            List<int> count021List = new List<int>();
+            List<decimal> count021List = new List<decimal>();
-            List<int> count022List = new List<int>();
+            var tb_type02 = alllist.GroupBy(x => x.Specification).Select(x => new
-            var getWorkAreas = from x in Funs.DB.WBS_UnitWork
-                               where x.ProjectId == this.ProjectId
-                               select x;
-            foreach (var itemWorkArea in getWorkAreas)
             {
-                type02List.Add(itemWorkArea.UnitWorkName);
+                Specification = x.Key,
-                var getWJots = from x in getAllJotList
+                Defect = x.Count()
-                               join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+            });
-                               where y.UnitWorkId == itemWorkArea.UnitWorkId
+            foreach (var item in tb_type02)
-                               select x;
+            {
-                count021List.Add(getWJots.Count());
+                type02List.Add(item.Specification);
-                var getWCJots = from x in getFinishedJotList
+                count021List.Add(item.Defect);
-                                join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
-                                where y.UnitWorkId == itemWorkArea.UnitWorkId
-                                select x;
-                count022List.Add(getWCJots.Count());
             }
             if (type02List.Count() > 0)
             {
                 E05_Type02 = JsonConvert.SerializeObject(type02List);
-                E05_Values02_1 = JsonConvert.SerializeObject(count021List);
+                E05_Values02 = JsonConvert.SerializeObject(count021List);
-                E05_Values02_2 = JsonConvert.SerializeObject(count022List);
             }
-
+            //焊缝类型
-            ///按材质类别
             List<string> type03List = new List<string>();
-            List<int> count031List = new List<int>();
+            List<decimal> count031List = new List<decimal>();
-            List<int> count032List = new List<int>();
+            var tb_type03 = alllist.GroupBy(x => x.WeldTypeCode).Select(x => new
-            var getMaterials = (from x in Funs.DB.Base_Material
-                               join y in Funs.DB.HJGL_Pipeline on x.MaterialId equals y.MaterialId  
-                               where y.ProjectId == this.ProjectId
-                               select x).ToList().Distinct();
-            foreach (var itemMaterial in getMaterials)
             {
-                string code = itemMaterial.MaterialCode;
+                WeldTypeCode = x.Key,
-                type03List.Add(code);
+                Defect = x.Count()
-                var getWJots = from x in getAllJotList
+            });
-                               join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+            foreach (var item in tb_type03)
-                               where y.MaterialId == itemMaterial.MaterialId
+            {
-                               select x;
+                type03List.Add(item.WeldTypeCode);
-                count031List.Add(getWJots.Count());
+                count031List.Add(item.Defect);
-                var getWCJots = from x in getFinishedJotList
-                                join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
-                                where y.MaterialId == itemMaterial.MaterialId
-                                select x;
-                count032List.Add(getWCJots.Count());
             }
             if (type03List.Count() > 0)
             {
                 E05_Type03 = JsonConvert.SerializeObject(type03List);
-                E05_Values03_1 = JsonConvert.SerializeObject(count031List);
+                E05_Values03 = JsonConvert.SerializeObject(count031List);
-                E05_Values03_2 = JsonConvert.SerializeObject(count032List);
+            }
+            //焊缝属性
+            List<string> type04List = new List<string>();
+            List<decimal> count041List = new List<decimal>();
+            var tb_type04 = alllist.GroupBy(x => x.JointAttribute).Select(x => new
+            {
+                JointAttribute = x.Key,
+                Defect = x.Count()
+            });
+            foreach (var item in tb_type04)
+            {
+                type04List.Add(item.JointAttribute);
+                count041List.Add(item.Defect);
+            }
+            if (type04List.Count() > 0)
+            {
+                E05_Type04 = JsonConvert.SerializeObject(type04List);
+                E05_Values04 = JsonConvert.SerializeObject(count041List);
             }
         }
         #endregion
@@ -604,10 +889,8 @@ namespace FineUIPro.Web
             E06_Values02 = "[]";
             E06_Type03 = "[]";
             E06_Values03 = "[]";
-            double PassRate = 0;
+            decimal TotalDin=0;
-            int current_pass_film = 0;
+            var allwelderEfficacy= from x in Funs.DB.SitePerson_Person
-            int cht_totalfilm = 0;
-            var allwelder = from x in Funs.DB.SitePerson_Person
                             join y in Funs.DB.HJGL_WeldJoint on x.PersonId equals y.CoverWelderId
                             join z in Funs.DB.HJGL_WeldingDaily on y.WeldingDailyId equals z.WeldingDailyId
                             join m in Funs.DB.HJGL_Pipeline on y.PipelineId equals m.PipelineId
@@ -623,84 +906,77 @@ namespace FineUIPro.Web
 
             //// 按单位
             List<string> type01List = new List<string>();
-            List<double> count011List = new List<double>();
+            List<decimal> count011List = new List<decimal>();
             foreach (var itemUnit in getProjectUnitList)
             {
                 string unitName = UnitService.GetUnitNameByUnitId(itemUnit.UnitId);
                 type01List.Add(unitName);
-                var getUJots = from x in getCH_CheckItemList
+                var getUJots = from x in allwelderEfficacy
                                where x.UnitId == itemUnit.UnitId
                                select x;
-                PassRate = 0;
+                TotalDin = getUJots.Sum(x => x.Size) ?? 0;
-                current_pass_film = getUJots.Sum(x => x.CHT_PassFilm) ?? 0;
+ 
-                cht_totalfilm = getUJots.Sum(x => x.CHT_TotalFilm) ?? 0;
+                count011List.Add(TotalDin);
-                if (cht_totalfilm > 0)
-                {
-                    PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
-                }
-                count011List.Add(PassRate);
             }
             if (type01List.Count() > 0)
             {
-                E08_Type01 = JsonConvert.SerializeObject(type01List);
+                E06_Type01 = JsonConvert.SerializeObject(type01List);
-                E08_Values01 = JsonConvert.SerializeObject(count011List);
+                E06_Values01 = JsonConvert.SerializeObject(count011List);
             }
             ///按单位工程           
             List<string> type02List = new List<string>();
-            List<double> count021List = new List<double>();
+            List<decimal> count021List = new List<decimal>();
             var getWorkAreas = from x in Funs.DB.WBS_UnitWork
                                where x.ProjectId == this.ProjectId
                                select x;
             foreach (var itemWorkArea in getWorkAreas)
             {
                 type02List.Add(itemWorkArea.UnitWorkName);
-                var getWJots = from x in getCH_CheckItemList
+                var getUJots = from x in allwelderEfficacy
-                               where x.WorkAreaId == itemWorkArea.UnitWorkId
+                               where x.UnitWorkId == itemWorkArea.UnitWorkId
                                select x;
+                TotalDin = getUJots.Sum(x => x.Size) ?? 0;
 
-                PassRate = 0;
+                count021List.Add(TotalDin);
-                current_pass_film = getWJots.Sum(x => x.CHT_PassFilm) ?? 0;
-                cht_totalfilm = getWJots.Sum(x => x.CHT_TotalFilm) ?? 0;
-                if (cht_totalfilm > 0)
-                {
-                    PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
-                }
-                count021List.Add(PassRate);
             }
             if (type02List.Count() > 0)
             {
-                E08_Type02 = JsonConvert.SerializeObject(type02List);
+                E06_Type02 = JsonConvert.SerializeObject(type02List);
-                E08_Values02 = JsonConvert.SerializeObject(count021List);
+                E06_Values02 = JsonConvert.SerializeObject(count021List);
             }
 
             ///按材质类别
             List<string> type03List = new List<string>();
-            List<double> count031List = new List<double>();
+            List<decimal> count031List = new List<decimal>();
-            var getMaterials = from x in Funs.DB.Base_Material
+            var getMaterials =( from x in Funs.DB.Base_Material
                                join y in Funs.DB.HJGL_Pipeline on x.MaterialId equals y.MaterialId
                                where y.ProjectId == this.ProjectId
-                               select x;
+                               select x).ToList().Distinct();
-            foreach (var itemMaterial in getMaterials)
+            var q = (from x in getMaterials
+                     join y in allwelderEfficacy on x.MaterialId equals y.MaterialId
+                     group new { x, y } by new { x.MaterialCode, y.Size } into g
+                     select new
+                     {
+                         MaterialCode = g.Key.MaterialCode,
+                         TotalDin = g.Sum(x => x.y.Size)
+
+                     }).GroupBy(x => x.MaterialCode).Select(x =>
+                     new
+                     {
+                         MaterialCode = x.Key,
+                         TotalDin=x.Sum(m=>m.TotalDin)
+                     }) ;
+            foreach (var itemMaterial in q)
             {
                 string code = itemMaterial.MaterialCode;
-                type03List.Add(code);
-                var getMJots = from x in getCH_CheckItemList
-                               where x.MaterialId == itemMaterial.MaterialId
-                               select x;
 
-                PassRate = 0;
+                type03List.Add(code);
-                current_pass_film = getMJots.Sum(x => x.CHT_PassFilm) ?? 0;
+                count031List.Add((decimal)itemMaterial.TotalDin);
-                cht_totalfilm = getMJots.Sum(x => x.CHT_TotalFilm) ?? 0;
-                if (cht_totalfilm > 0)
-                {
-                    PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
-                }
-                count031List.Add(PassRate);
             }
             if (type03List.Count() > 0)
             {
-                E08_Type03 = JsonConvert.SerializeObject(type03List);
+                E06_Type03 = JsonConvert.SerializeObject(type03List);
-                E08_Values03 = JsonConvert.SerializeObject(count031List);
+                E06_Values03 = JsonConvert.SerializeObject(count031List);
             }
         }
 

SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.designer.cs

@@ -41,6 +41,24 @@ namespace FineUIPro.Web
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divWelderNum;
 
+        /// <summary>
+        /// echarts02Value 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl echarts02Value;
+
+        /// <summary>
+        /// div2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div2;
+
         /// <summary>
         /// divWelderEfficacyNum 控件。
         /// </summary>
@@ -49,5 +67,14 @@ namespace FineUIPro.Web
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divWelderEfficacyNum;
+
+        /// <summary>
+        /// div1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div1;
     }
 }

SGGL/Model/HJGL/PackagingManageItem.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public  class PackagingManageDetailItem
+    {
+        public string PackagingManageId { get; set; }
+        public string PackagingCode { get; set; }
+        public string ProjectName { get; set; }
+        public string ContactName { get; set; }
+        public string ContactPhone { get; set; }
+        public string StackingPosition { get; set; }
+        public string PlanStartDate { get; set; }
+        public string UnitWorkName { get; set; }
+    }
+    public class PackagingPrepipeItem
+    { 
+        public string PipelineComponentCode { get; set; }
+        public string PreUnit { get; set; }
+        public string UnitWorkName { get; set; }
+
+    }
+    public class PackagingManageItem
+    {
+        public PackagingManageDetailItem packagingManageDetailItem { get; set; }
+        public List<PackagingPrepipeItem> packagingPrepipeItems { get; set; }
+    }
+
+}

SGGL/Model/HJGL/PrePipelineItem.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public class PrePipelineItem
+    {
+    }
+}

SGGL/Model/HJGL/sp_index_HJGLItem.cs

@@ -49,6 +49,16 @@ namespace Model
             get;
             set;
         }
+        public string UnitName
+        {
+            get;
+            set;
+        }
+        public string UnitWorkName
+        {
+            get;
+            set;
+        }
         /// <summary>
         /// 
         /// </summary>
@@ -65,6 +75,26 @@ namespace Model
             get;
             set;
         }
+        public string MaterialCode
+        {
+            get;
+            set;
+        }
+        public string Specification
+        {
+            get;
+            set;
+        }
+        public string WeldTypeCode
+        {
+            get;
+            set;
+        }
+        public string JointAttribute
+        {
+            get;
+            set;
+        }
         /// <summary>
         /// 
         /// </summary>
@@ -81,5 +111,6 @@ namespace Model
             get;
             set;
         }
+
     }
 }

SGGL/Model/Model.csproj

@@ -162,9 +162,11 @@
     <Compile Include="HandleStep.cs" />
     <Compile Include="HJGL\3DParameter.cs" />
     <Compile Include="HJGL\MaterialStockItem.cs" />
+    <Compile Include="HJGL\PackagingManageItem.cs" />
     <Compile Include="HJGL\Pipeline_ComponentQRCodeItem.cs" />
     <Compile Include="HJGL\PointBatch.cs" />
     <Compile Include="HJGL\PointBatchItem.cs" />
+    <Compile Include="HJGL\PrePipelineItem.cs" />
     <Compile Include="HJGL\SpWeldingDailyItem.cs" />
     <Compile Include="HJGL\sp_index_HJGLItem.cs" />
     <Compile Include="HSSE\DigDataHSEDataCollectItem.cs" />

SGGL/WebAPI/Controllers/HJGL/PackagingManageController.cs

@@ -0,0 +1,32 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+
+namespace WebAPI.Controllers.HJGL
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class PackagingManageController : ApiController
+    {
+        public Model.ResponeData getPackagingManagebyId(string PackagingManageId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = from x in Funs.DB;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+    }
+}

SGGL/WebAPI/WebAPI.csproj

@@ -169,6 +169,7 @@
     <Compile Include="Controllers\CommonController.cs" />
     <Compile Include="Controllers\CQMS\CQMSPersonManageController.cs" />
     <Compile Include="Controllers\CQMS\WBSController.cs" />
+    <Compile Include="Controllers\HJGL\PackagingManageController.cs" />
     <Compile Include="Controllers\HTGL\HTGLPersonController.cs" />
     <Compile Include="Controllers\Person\PersonCheckController.cs" />
     <Compile Include="Controllers\CQMS\CheckEquipmentController.cs" />