From c8a1a089ae0eb6d97661514b98951f22c4f1a759 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 21 Jun 2024 15:20:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InspectionPersonDataIn.aspx.cs            |  2 +-
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user  |  2 +-
 SGGL/FineUIPro.Web/common/mainProject2.aspx   | 28 +++++++++++++------
 SGGL/WebAPI/WebAPI.csproj.user                |  2 +-
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs
index 54d9d3d5..b2f87b15 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs
@@ -570,7 +570,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                             oldViewInfo.Remark = pds.Rows[i][13].ToString().Trim();
                             oldViewInfo.RemarkCode = Funs.GetNewInt(pds.Rows[i][14].ToString().Trim());
 
-                            oldViewInfo.InspectionPersonId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson));
+                            //oldViewInfo.InspectionPersonId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson));
                             oldViewInfo.CompileMan = this.CurrUser.UserId;
                             oldViewInfo.CompileDate = DateTime.Now.Date;
                             oldViewInfo.Status = BLL.Const.Comprehensive_Compile;
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index 63722353..cb873201 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx b/SGGL/FineUIPro.Web/common/mainProject2.aspx
index d57e9cde..2fb63341 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx
@@ -630,7 +630,7 @@
         }
     })
     // 焊接一次合格率
-    hjmap()
+    //hjmap()
     function hjmap() {
         let allNumber = 70  // 总计
         let finishNumber = 360 // 完成的数量
@@ -715,7 +715,7 @@
         aPassChart.setOption(AOption1);
     }
     // 施工质量一次共检合格率
-    ycmap()
+    //ycmap()
     function ycmap() {
         let allNumber = 70  // 总计
         let finishNumber = 360 // 完成的数量
@@ -1290,7 +1290,9 @@
     }
 
     var two =<%=Two %>;
-    var xArr1 = two.categories
+    console.log(two)
+    if (Array.isArray(two.series) && two.series.length == 6) {
+         var xArr1 = two.categories
     var data1 = [{
         name: '本月BCWS',
         type: 'bar',
@@ -1337,6 +1339,8 @@
         }
     }]
     line('left_one', xArr1, data1)
+    }
+   
 </script>
 <script>
     function category(id, xArr, series) {
@@ -1475,7 +1479,7 @@
         },
         itemStyle: { normal: { color: '#0c81fe' } }
     }];
-    category('left_two', xArr2, series)
+    //category('left_two', xArr2, series)
 </script>
 <script>
     // 图片滚动
@@ -1597,6 +1601,10 @@
     createAQTJ()
     function createAQTJ() {
         var two =<%=Two %>;
+        console.log("安全统计", two)
+        if (!Array.isArray(two.series)) {
+            return
+        }
         //let type = ['类别11111111', '类别211111111', '类别3', '类别4', '类别5', '类别6', '类别7', '类别8', '类别9', '类别10']
         let type = two.categories
         // 累计BCWS
@@ -1770,14 +1778,17 @@
     }
 
     // 质量概况
-    let weekData = [
+ <%--   let weekData = [
         { name: '质量问题整改率', value1: <%=zlallNumber%>, value2: <%=zlfinishNumber%>, el: 'zl-map1' },
         { name: '一次共检合格率', value1: <%=zlgjallNumber%>, value2: <%=zlgjfinishNumber%>, el: 'zl-map2' },
         { name: '焊接一次合格率', value1: <%=hjallNumber%>, value2: <%=hjfinishNumber%>, el: 'zl-map3' },
     ]
     weekData.forEach(e => {
         createZL(e)
-    })
+    })--%>
+    createZL({ name: '质量问题整改率', value1: <%=zlallNumber%>, value2: <%=zlfinishNumber%>, el: 'zl-map1' })
+     createZL({ name: '一次共检合格率', value1: <%=zlgjallNumber%>, value2: <%=zlgjfinishNumber%>, el: 'zl-map2' })
+    createZL({ name: '焊接一次合格率', value1: <%=hjallNumber%>, value2: <%=hjfinishNumber%>, el: 'zl-map3' })
     function createZL(obj) {
         let AOption1 = {
             title: [{
@@ -1945,15 +1956,16 @@
     createFXMap()
     function createFXMap() {
 
-        const list = [
+     const list = [
             { TypeName: "重大风险", ValueAmount: <%=riskData4%> },
             { TypeName: "低风险", ValueAmount: <%=riskData1%> },
             { TypeName: "一般风险", ValueAmount: <%=riskData3%> },
             { TypeName: "较大风险", ValueAmount: <%=riskData2%> },
         ]
+        
+       
         // 数据类型
         let value = <%=riskDataRate%>;
-
         const color = ['#673646', '#1A3B73', '#5E672F', '#674B1B']
         const color1 = ['#FF7474', '#1FC6FF', '#E9E931', '#FFA602']
         // 计算插入的数据的值
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 5fe155da..bd497c6b 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />